github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Chore: misc updates

pull/8353/merge
Leopoldthecoder 2017-11-26 16:07:44 +08:00 committed by 杨奕
parent abd2d7de36
commit 7a4ec97f0d
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -18,10 +18,6 @@
> A Vue.js 2.0 UI Toolkit for Web.
<!--<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/bD3dKbdDE2F7Ky9LUN1kjTFK/ElemeFE/element'>-->
<!--<img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/bD3dKbdDE2F7Ky9LUN1kjTFK/ElemeFE/element.svg' />-->
<!--</a >-->
## Links
- Homepage and documentation
- International users: http://element.eleme.io/

2
build/bin/version.js
View File

@ -1,6 +1,6 @@
var fs = require('fs');
var path = require('path');
var version = process.env.VERSION || require('../../package.json').version;
var content = { '1.0.9': '1.0', '1.1.6': '1.1', '1.2.9': '1.2', '1.3.7': '1.3', '1.4.10': '1.4' };
var content = { '1.0.9': '1.0', '1.1.6': '1.1', '1.2.9': '1.2', '1.3.7': '1.3', '1.4.11': '1.4' };
if (!content[version]) content[version] = '2.0';
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

1
examples/docs/en-US/i18n.md
View File

@ -207,6 +207,7 @@ Currently Element ships with the following languages:
<li>Slovenian (sl)</li>
<li>Arabic (ar)</li>
<li>Hebrew (he)</li>
<li>Lithuanian (lt)</li>
</ul>
If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/ElemeFE/element/tree/master/src/locale/lang) and create a pull request.

1
examples/docs/zh-CN/i18n.md
View File

@ -219,6 +219,7 @@ ElementLocale.i18n((key, value) => i18n.t(key, value))
<li>斯洛文尼亚语（sl）</li>
<li>阿拉伯语（ar）</li>
<li>希伯来语（he）</li>
<li>立陶宛语（lt）</li>
</ul>
如果你需要使用其他的语言，欢迎贡献 PR：只需在 [这里](https://github.com/ElemeFE/element/tree/master/src/locale/lang) 添加一个语言配置文件即可。

1
examples/index.tpl
View File

@ -9,7 +9,6 @@
</head>
<body>
<div id="app"></div><% if (process.env.NODE_ENV === 'production') { %>
<!--<script src="https://app.codesponsor.io/scripts/qFcVkt4f3DQEg4zrwINGVg?theme=light&height=250&width=240"></script>-->
<script>
if (!window.Promise) {
document.write('<script src="//shadow.elemecdn.com/npm/es6-promise@4.1.1/dist/es6-promise.min.js"><\/script><script>ES6Promise.polyfill()<\/script>')

2
examples/versions.json
View File

@ -1 +1 @@
{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.10":"1.4","2.0.5":"2.0"}
{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.11":"1.4","2.0.5":"2.0"}

2
packages/select/src/select.vue
View File

@ -560,7 +560,7 @@
let input = [].filter.call(inputChildNodes, item => item.tagName === 'INPUT')[0];
const tags = this.$refs.tags;
input.style.height = this.selected.length === 0
? sizeMap[this.selectSize] || 40 + 'px'
? (sizeMap[this.selectSize] || 40) + 'px'
: Math.max(tags ? (tags.clientHeight + 10) : 0, sizeMap[this.selectSize] || 40) + 'px';
if (this.visible && this.emptyText !== false) {
this.broadcast('ElSelectDropdown', 'updatePopper');

6
packages/table/src/table.vue
View File

@ -475,7 +475,11 @@
immediate: true,
handler(val) {
this.store.commit('setData', val);
if (this.$ready) this.doLayout();
if (this.$ready) {
this.$nextTick(() => {
this.doLayout();
});
}
}
},