update

x-extends · Aug 8, 2019 · 6b64473 · 6b64473
1 parent 95bd7a2
commit 6b64473
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@
 [![gzip size: CSS](http://img.badgesize.io/https://unpkg.com/vxe-table-plugin-antd/dist/style.min.css?compression=gzip&label=gzip%20size:%20CSS)](https://unpkg.com/vxe-table-plugin-antd/dist/style.min.css)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/xuliangzhan/vxe-table-plugin-antd/blob/master/LICENSE)
 
-该插件用于在 vxe-table 表格中适配 ant-design-vue 组件的渲染
+该插件用于在 [vxe-table](https://github.com/xuliangzhan/vxe-table) 的渲染器中适配 [ant-design-vue](https://www.npmjs.com/package/ant-design-vue)
 
 ## Installing
 
 ```shell
-npm install xe-utils vxe-table vxe-table-plugin-antd
+npm install xe-utils vxe-table vxe-table-plugin-antd ant-design-vue
 ```
 
 ```javascript
@@ -42,7 +42,7 @@ VXETable.use(VXETablePluginAntd)
 
 | 属性 | 描述 | 类型 | 可选值 | 默认值 |
 |------|------|-----|-----|-----|
-| name | 支持的渲染组件 | String | AInput, AAutocomplete, AInputNumber, ASelect | — |
+| name | 支持的渲染组件 | String | AInput, AAutocomplete, AInputNumber, ASelect, ASwitch, ARate | — |
 | props | 渲染组件附加属性，参数请查看被渲染的 Component props | Object | — | {} |
 | options | 只对 name=ASelect 有效，下拉组件选项列表 | Array | — | [] |
 | optionProps | 只对 name=ASelect 有效，下拉组件选项属性参数配置 | Object | — | { value: 'value', label: 'label' } |

diff --git a/dist/index.common.js b/dist/index.common.js
@@ -87,9 +87,11 @@ function getCellEvents(editRender, params) {
 function defaultCellRender(h, editRender, params) {
   var row = params.row,
       column = params.column;
+  var attrs = editRender.attrs;
   var props = getProps(params, editRender);
   return [h(editRender.name, {
     props: props,
+    attrs: attrs,
     model: {
       value: _xeUtils["default"].get(row, column.property),
       callback: function callback(value) {
@@ -116,15 +118,20 @@ function getFilterEvents(on, filterRender, params) {
 
 function defaultFilterRender(h, filterRender, params, context) {
   var column = params.column;
-  var name = filterRender.name;
-  var type = 'input';
+  var name = filterRender.name,
+      attrs = filterRender.attrs;
   var props = getProps(params, filterRender);
+  var type = 'change';
 
   switch (name) {
     case 'AAutoComplete':
       type = 'select';
       break;
 
+    case 'AInput':
+      type = 'input';
+      break;
+
     case 'AInputNumber':
       type = 'change';
       break;
@@ -133,6 +140,7 @@ function defaultFilterRender(h, filterRender, params, context) {
   return column.filters.map(function (item) {
     return h(name, {
       props: props,
+      attrs: attrs,
       model: {
         value: item.data,
         callback: function callback(optionValue) {
@@ -211,13 +219,15 @@ var renderMap = {
           optionGroupProps = _editRender$optionGro === void 0 ? {} : _editRender$optionGro;
       var row = params.row,
           column = params.column;
+      var attrs = editRender.attrs;
       var props = getProps(params, editRender);
 
       if (optionGroups) {
         var groupOptions = optionGroupProps.options || 'options';
         var groupLabel = optionGroupProps.label || 'label';
         return [h('a-select', {
           props: props,
+          attrs: attrs,
           model: {
             value: _xeUtils["default"].get(row, column.property),
             callback: function callback(cellValue) {
@@ -236,6 +246,7 @@ var renderMap = {
 
       return [h('a-select', {
         props: props,
+        attrs: attrs,
         model: {
           value: _xeUtils["default"].get(row, column.property),
           callback: function callback(cellValue) {
@@ -296,6 +307,7 @@ var renderMap = {
           _filterRender$optionG = filterRender.optionGroupProps,
           optionGroupProps = _filterRender$optionG === void 0 ? {} : _filterRender$optionG;
       var column = params.column;
+      var attrs = filterRender.attrs;
       var props = getProps(params, filterRender);
 
       if (optionGroups) {
@@ -304,6 +316,7 @@ var renderMap = {
         return column.filters.map(function (item) {
           return h('a-select', {
             props: props,
+            attrs: attrs,
             model: {
               value: item.data,
               callback: function callback(optionValue) {
@@ -328,6 +341,7 @@ var renderMap = {
       return column.filters.map(function (item) {
         return h('a-select', {
           props: props,
+          attrs: attrs,
           model: {
             value: item.data,
             callback: function callback(optionValue) {
@@ -434,10 +448,14 @@ var renderMap = {
     }
   },
   ARate: {
-    renderEdit: defaultCellRender
+    renderEdit: defaultCellRender,
+    renderFilter: defaultFilterRender,
+    filterMethod: defaultFilterMethod
   },
   ASwitch: {
-    renderEdit: defaultCellRender
+    renderEdit: defaultCellRender,
+    renderFilter: defaultFilterRender,
+    filterMethod: defaultFilterMethod
   }
   /**
    * 事件兼容性处理

diff --git a/dist/index.js b/dist/index.js
@@ -99,9 +99,11 @@
   function defaultCellRender(h, editRender, params) {
     var row = params.row,
         column = params.column;
+    var attrs = editRender.attrs;
     var props = getProps(params, editRender);
     return [h(editRender.name, {
       props: props,
+      attrs: attrs,
       model: {
         value: _xeUtils["default"].get(row, column.property),
         callback: function callback(value) {
@@ -128,15 +130,20 @@
 
   function defaultFilterRender(h, filterRender, params, context) {
     var column = params.column;
-    var name = filterRender.name;
-    var type = 'input';
+    var name = filterRender.name,
+        attrs = filterRender.attrs;
     var props = getProps(params, filterRender);
+    var type = 'change';
 
     switch (name) {
       case 'AAutoComplete':
         type = 'select';
         break;
 
+      case 'AInput':
+        type = 'input';
+        break;
+
       case 'AInputNumber':
         type = 'change';
         break;
@@ -145,6 +152,7 @@
     return column.filters.map(function (item) {
       return h(name, {
         props: props,
+        attrs: attrs,
         model: {
           value: item.data,
           callback: function callback(optionValue) {
@@ -223,13 +231,15 @@
             optionGroupProps = _editRender$optionGro === void 0 ? {} : _editRender$optionGro;
         var row = params.row,
             column = params.column;
+        var attrs = editRender.attrs;
         var props = getProps(params, editRender);
 
         if (optionGroups) {
           var groupOptions = optionGroupProps.options || 'options';
           var groupLabel = optionGroupProps.label || 'label';
           return [h('a-select', {
             props: props,
+            attrs: attrs,
             model: {
               value: _xeUtils["default"].get(row, column.property),
               callback: function callback(cellValue) {
@@ -248,6 +258,7 @@
 
         return [h('a-select', {
           props: props,
+          attrs: attrs,
           model: {
             value: _xeUtils["default"].get(row, column.property),
             callback: function callback(cellValue) {
@@ -308,6 +319,7 @@
             _filterRender$optionG = filterRender.optionGroupProps,
             optionGroupProps = _filterRender$optionG === void 0 ? {} : _filterRender$optionG;
         var column = params.column;
+        var attrs = filterRender.attrs;
         var props = getProps(params, filterRender);
 
         if (optionGroups) {
@@ -316,6 +328,7 @@
           return column.filters.map(function (item) {
             return h('a-select', {
               props: props,
+              attrs: attrs,
               model: {
                 value: item.data,
                 callback: function callback(optionValue) {
@@ -340,6 +353,7 @@
         return column.filters.map(function (item) {
           return h('a-select', {
             props: props,
+            attrs: attrs,
             model: {
               value: item.data,
               callback: function callback(optionValue) {
@@ -446,10 +460,14 @@
       }
     },
     ARate: {
-      renderEdit: defaultCellRender
+      renderEdit: defaultCellRender,
+      renderFilter: defaultFilterRender,
+      filterMethod: defaultFilterMethod
     },
     ASwitch: {
-      renderEdit: defaultCellRender
+      renderEdit: defaultCellRender,
+      renderFilter: defaultFilterRender,
+      filterMethod: defaultFilterMethod
     }
     /**
      * 事件兼容性处理