Skip to content

Commit

Permalink
0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
levy committed Sep 24, 2018
1 parent 1bc1cb3 commit 25fa104
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 15 deletions.
9 changes: 6 additions & 3 deletions dist/el-data-table.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,13 @@ var component = {render: function(){var _vm=this;var _h=_vm.$createElement;var _

// query 有可能值为 0
var params = Object.keys(query)
.filter(function (key) {
var k = query[key].trim();
.filter(function (k) {
return k !== '' && k !== null && k !== undefined
})
.reduce(function (params, k) { return (params += "&" + k + "=" + (encodeURI(query[k]))); }, '');
.reduce(
function (params, k) { return (params += "&" + k + "=" + (encodeURI(query[k].toString().trim()))); },
''
);

url += params;

Expand Down Expand Up @@ -491,6 +493,7 @@ var component = {render: function(){var _vm=this;var _h=_vm.$createElement;var _
this.query = Object.assign({}, data, customQuery);
},
onResetSearch: function onResetSearch() {
// reset后, form里的值会变成 undefined, 在下一次查询会赋值给query
this.$refs.searchForm.resetFields();
this.query = {};

Expand Down
2 changes: 1 addition & 1 deletion dist/el-data-table.min.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions dist/el-data-table.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,13 @@

// query 有可能值为 0
var params = Object.keys(query)
.filter(function (key) {
var k = query[key].trim();
.filter(function (k) {
return k !== '' && k !== null && k !== undefined
})
.reduce(function (params, k) { return (params += "&" + k + "=" + (encodeURI(query[k]))); }, '');
.reduce(
function (params, k) { return (params += "&" + k + "=" + (encodeURI(query[k].toString().trim()))); },
''
);

url += params;

Expand Down Expand Up @@ -497,6 +499,7 @@
this.query = Object.assign({}, data, customQuery);
},
onResetSearch: function onResetSearch() {
// reset后, form里的值会变成 undefined, 在下一次查询会赋值给query
this.$refs.searchForm.resetFields();
this.query = {};

Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>El Data Table Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.2e06ea66.js"></script></body></html>
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>El Data Table Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.c365fc0d.js"></script></body></html>
2 changes: 1 addition & 1 deletion docs/storybook/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
<body>
<div id="root"></div>
<div id="error-display"></div>
<script type="text/javascript" src="static/preview.ac142e06b060a0dfaab4.bundle.js"></script></body>
<script type="text/javascript" src="static/preview.8a203989e0d773c8b302.bundle.js"></script></body>

</html>
2 changes: 1 addition & 1 deletion docs/storybook/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
</head>
<body style="margin: 0;">
<div id="root"></div>
<script type="text/javascript" src="static/manager.90177b5a749be80c7b9f.bundle.js"></script></body>
<script type="text/javascript" src="static/manager.e9beff932557ad1c9c76.bundle.js"></script></body>
</html>

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "el-data-table",
"version": "0.9.0",
"version": "0.9.1",
"description": "base on element-ui, makes crud easily",
"author": "https://github.com/FEMessage",
"license": "MIT",
Expand Down

0 comments on commit 25fa104

Please sign in to comment.