From 4ef4bf8806dfe458e15ab7bd2ec24c53eb624e7f Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Thu, 4 Feb 2021 21:53:53 +0800
Subject: [PATCH] =?UTF-8?q?form-item=20=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20className?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/App.vue               |  4 ++--
 examples/api/form-item.js      |  9 +++++++++
 package.json                   |  2 +-
 packages/form/src/form-item.js |  1 +
 packages/form/src/form.js      |  2 +-
 packages/table/src/methods.js  | 15 ++++++++-------
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index 3c6a51b80..f9010c389 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -64,13 +64,13 @@
           </div>
           <div class="docs">
             <template v-if="apiList.length">
-              <ul class="nav-child-menu">
+              <!-- <ul class="nav-child-menu">
                 <li>
                   <router-link class="nav-link" :to="{name: 'Preview'}">
                     <span>粘性表格-概念</span>
                   </router-link>
                 </li>
-              </ul>
+              </ul> -->
               <ul class="nav-menu">
                 <li v-for="(item, index) in apiList" :key="index" :class="{expand: item.expand}">
                   <a class="nav-link" @click="linkEvent(item)" :title="item.disabled ? $t('app.body.other.newFunc') : item.label" :class="{disabled: item.disabled, active: pageKey === item.value}">
diff --git a/examples/api/form-item.js b/examples/api/form-item.js
index 2ba0ab27c..8c7f495d2 100644
--- a/examples/api/form-item.js
+++ b/examples/api/form-item.js
@@ -102,6 +102,15 @@ const apis = [
         defVal: '',
         list: []
       },
+      {
+        name: 'class-name',
+        desc: '给表单项附加 className',
+        version: '3.1.5',
+        type: 'string',
+        enum: '',
+        defVal: '',
+        list: []
+      },
       {
         name: 'visible',
         descKey: 'app.api.formItem.desc.visible',
diff --git a/package.json b/package.json
index 1f46ff582..03fa1c482 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.1.4",
+  "version": "3.1.5-beta.0",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、模态窗口、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/packages/form/src/form-item.js b/packages/form/src/form-item.js
index 7c4ce418c..c8c3811de 100644
--- a/packages/form/src/form-item.js
+++ b/packages/form/src/form-item.js
@@ -8,6 +8,7 @@ const props = {
   align: String,
   titleAlign: String,
   titleWidth: [String, Number],
+  className: String,
   titlePrefix: Object,
   titleSuffix: Object,
   resetValue: { default: null },
diff --git a/packages/form/src/form.js b/packages/form/src/form.js
index fc442f7a7..c63e17246 100644
--- a/packages/form/src/form.js
+++ b/packages/form/src/form.js
@@ -131,7 +131,7 @@ function renderItems (h, _vm) {
       contentVNs = [`${XEUtils.get(data, field)}`]
     }
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? `vxe-col--${span} is--span` : null, {
+      class: ['vxe-form--item', item.id, span ? `vxe-col--${span} is--span` : null, item.className, {
         'is--title': title,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
diff --git a/packages/table/src/methods.js b/packages/table/src/methods.js
index 819a3ab25..7c3e766a9 100644
--- a/packages/table/src/methods.js
+++ b/packages/table/src/methods.js
@@ -1018,16 +1018,17 @@ const Methods = {
       tableData = tableData.filter(row => {
         return filterColumns.every(({ column, valueList, itemList }) => {
           if (valueList.length && !allRemoteFilter) {
-            const { filterRender, property } = column
-            let { filterMethod } = column
+            const { filterMethod, filterRender } = column
             const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
-            if (!filterMethod && compConf && compConf.renderFilter) {
-              filterMethod = compConf.filterMethod
-            }
-            if (allFilterMethod && !filterMethod) {
+            const compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null
+            if (filterMethod) {
+              return itemList.some((item) => filterMethod({ value: item.value, option: item, row, column, $table: this }))
+            } else if (allFilterMethod) {
               return allFilterMethod({ options: itemList, values: valueList, row, column })
+            } else if (compFilterMethod) {
+              return itemList.some((item) => compFilterMethod({ value: item.value, option: item, row, column, $table: this }))
             }
-            return filterMethod ? itemList.some(item => filterMethod({ value: item.value, option: item, row, column })) : valueList.indexOf(XEUtils.get(row, property)) > -1
+            return valueList.indexOf(XEUtils.get(row, column.property)) > -1
           }
           return true
         })