Skip to content

E
Element
Commit 5406a973 authored by Leopoldthecoder's avatar Leopoldthecoder Committed by 杨奕
Browse files
Options

Chore: misc updates

parent 23e86bcf
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 52 deletions
build/bin/version.js
View file @ 5406a973
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var version = process.env.VERSION || require('../../package.json').version; 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.9': '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.10': '1.4' };
if (!content[version]) content[version] = '2.0'; if (!content[version]) content[version] = '2.0';
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));
examples/docs/en-US/collapse.md
View file @ 5406a973
...@@ -111,7 +111,7 @@ Besides using the `title` attribute, you can customize panel title with named sl ...@@ -111,7 +111,7 @@ Besides using the `title` attribute, you can customize panel title with named sl
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item name="1"> <el-collapse-item name="1">
<template slot="title"> <template slot="title">
Consistency<i class="header-icon el-icon-information"></i> Consistency<i class="header-icon el-icon-info"></i>
</template> </template>
<div>Consistent with real life: in line with the process and logic of real life, and comply with languages and habits that the users are used to;</div> <div>Consistent with real life: in line with the process and logic of real life, and comply with languages and habits that the users are used to;</div>
<div>Consistent within interface: all elements should be consistent, such as: design style, icons and texts, position of elements, etc.</div> <div>Consistent within interface: all elements should be consistent, such as: design style, icons and texts, position of elements, etc.</div>
......
examples/docs/en-US/date-picker.md
View file @ 5406a973
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
data() { data() {
return { return {
pickerOptions1: { pickerOptions1: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{ shortcuts: [{
text: 'Today', text: 'Today',
onClick(picker) { onClick(picker) {
...@@ -127,6 +130,9 @@ Basic date picker measured by 'day'. ...@@ -127,6 +130,9 @@ Basic date picker measured by 'day'.
data() { data() {
return { return {
pickerOptions1: { pickerOptions1: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{ shortcuts: [{
text: 'Today', text: 'Today',
onClick(picker) { onClick(picker) {
......
examples/docs/en-US/input.md
View file @ 5406a973
...@@ -644,10 +644,10 @@ Search data from server-side. ...@@ -644,10 +644,10 @@ Search data from server-side.
| Name | Description | | Name | Description |
|------|--------| |------|--------|
| prefix | content as Input prefix | | prefix | content as Input prefix, only works when `type` is 'text' |
| suffix | content as Input suffix | | suffix | content as Input suffix, only works when `type` is 'text' |
| prepend | content to prepend before Input | | prepend | content to prepend before Input, only works when `type` is 'text' |
| append | content to append after Input | | append | content to append after Input, only works when `type` is 'text' |
### Input Events ### Input Events
......
examples/docs/en-US/loading.md
View file @ 5406a973
...@@ -233,7 +233,9 @@ Loading.service(options); ...@@ -233,7 +233,9 @@ Loading.service(options);
The parameter `options` is the configuration of Loading, and its details can be found in the following table. `LoadingService` returns a Loading instance, and you can close it by invoking its `close` method: The parameter `options` is the configuration of Loading, and its details can be found in the following table. `LoadingService` returns a Loading instance, and you can close it by invoking its `close` method:
```javascript ```javascript
let loadingInstance = Loading.service(options); let loadingInstance = Loading.service(options);
loadingInstance.close(); this.$nextTick(() => { // Loading should be closed asynchronously
loadingInstance.close();
});
``` ```
Note that in this case the full screen Loading is singleton. If a new full screen Loading is invoked before an existing one is closed, the existing full screen Loading instance will be returned instead of actually creating another Loading instance: Note that in this case the full screen Loading is singleton. If a new full screen Loading is invoked before an existing one is closed, the existing full screen Loading instance will be returned instead of actually creating another Loading instance:
```javascript ```javascript
......
examples/docs/zh-CN/collapse.md
View file @ 5406a973
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item> <el-collapse-item>
<template slot="title"> <template slot="title">
一致性 Consistency<i class="header-icon el-icon-information"></i> 一致性 Consistency<i class="header-icon el-icon-info"></i>
</template> </template>
<div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div> <div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div>
<div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div> <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div>
......
examples/docs/zh-CN/date-picker.md
View file @ 5406a973
...@@ -2,14 +2,9 @@ ...@@ -2,14 +2,9 @@
module.exports = { module.exports = {
data() { data() {
return { return {
pickerOptions0: {
disabledDate(time) {
return time.getTime() > Date.now();
}
},
pickerOptions1: { pickerOptions1: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7; return time.getTime() > Date.now();
}, },
shortcuts: [{ shortcuts: [{
text: '今天', text: '今天',
...@@ -115,8 +110,7 @@ ...@@ -115,8 +110,7 @@
<el-date-picker <el-date-picker
v-model="value1" v-model="value1"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期">
:picker-options="pickerOptions0">
</el-date-picker> </el-date-picker>
</div> </div>
<div class="block"> <div class="block">
...@@ -135,12 +129,10 @@ ...@@ -135,12 +129,10 @@
export default { export default {
data() { data() {
return { return {
pickerOptions0: { pickerOptions1: {
disabledDate(time) { disabledDate(time) {
return time.getTime() > Date.now(); return time.getTime() > Date.now();
} },
},
pickerOptions1: {
shortcuts: [{ shortcuts: [{
text: '今天', text: '今天',
onClick(picker) { onClick(picker) {
......
examples/docs/zh-CN/input.md
View file @ 5406a973
...@@ -799,10 +799,10 @@ export default { ...@@ -799,10 +799,10 @@ export default {
### Input slots ### Input slots
| name | 说明 | | name | 说明 |
|------|--------| |------|--------|
| prefix | 输入框头部内容 | | prefix | 输入框头部内容，只对 `type="text"` 有效 |
| suffix | 输入框尾部内容 | | suffix | 输入框尾部内容，只对 `type="text"` 有效 |
| prepend | 输入框前置内容 | | prepend | 输入框前置内容，只对 `type="text"` 有效 |
| append | 输入框后置内容 | | append | 输入框后置内容，只对 `type="text"` 有效 |
### Input Events ### Input Events
| 事件名称 | 说明 | 回调参数 | | 事件名称 | 说明 | 回调参数 |
......
examples/docs/zh-CN/loading.md
View file @ 5406a973
...@@ -231,7 +231,9 @@ Loading.service(options); ...@@ -231,7 +231,9 @@ Loading.service(options);
其中 `options` 参数为 Loading 的配置项，具体见下表。`LoadingService` 会返回一个 Loading 实例，可通过调用该实例的 `close` 方法来关闭它： 其中 `options` 参数为 Loading 的配置项，具体见下表。`LoadingService` 会返回一个 Loading 实例，可通过调用该实例的 `close` 方法来关闭它：
```javascript ```javascript
let loadingInstance = Loading.service(options); let loadingInstance = Loading.service(options);
loadingInstance.close(); this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
``` ```
需要注意的是，以服务的方式调用的全屏 Loading 是单例的：若在前一个全屏 Loading 关闭前再次调用全屏 Loading，并不会创建一个新的 Loading 实例，而是返回现有全屏 Loading 的实例： 需要注意的是，以服务的方式调用的全屏 Loading 是单例的：若在前一个全屏 Loading 关闭前再次调用全屏 Loading，并不会创建一个新的 Loading 实例，而是返回现有全屏 Loading 的实例：
```javascript ```javascript
......
examples/versions.json
View file @ 5406a973
{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.9":"1.4","2.0.4":"2.0"} {"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.4":"2.0"}
\ No newline at end of file \ No newline at end of file
packages/date-picker/src/panel/date.vue
View file @ 5406a973
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
dateFormat() { dateFormat() {
if (this.format) { if (this.format) {
return this.format.replace('HH', '').replace(':mm', '').replace(':ss', '').trim(); return this.format.replace('HH', '').replace(/[^a-zA-Z]*mm/, '').replace(/[^a-zA-Z]*ss/, '').trim();
} else { } else {
return 'yyyy-MM-dd'; return 'yyyy-MM-dd';
} }
......
packages/dropdown/src/dropdown.vue
View file @ 5406a973
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
if (!this.splitButton) { // 自定义 if (!this.splitButton) { // 自定义
this.triggerElm.setAttribute('role', 'button'); this.triggerElm.setAttribute('role', 'button');
this.triggerElm.setAttribute('tabindex', '0'); this.triggerElm.setAttribute('tabindex', '0');
this.triggerElm.className += ' el-dropdown-selfdefine'; // 控制 this.triggerElm.setAttribute('class', this.triggerElm.getAttribute('class') + ' el-dropdown-selfdefine'); // 控制
} }
}, },
initEvent() { initEvent() {
......
packages/theme-chalk/src/icon.scss
View file @ 5406a973
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
@font-face { @font-face {
font-family: 'element-icons'; font-family: 'element-icons';
src: url('#{$--font-path}/element-icons.woff?t=1508751886602') format('woff'), /* chrome, firefox */ src: url('#{$--font-path}/element-icons.woff?t=1510834658947') format('woff'), /* chrome, firefox */
url('#{$--font-path}/element-icons.ttf?t=1508751886602') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ url('#{$--font-path}/element-icons.ttf?t=1510834658947') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
font-weight: normal; font-weight: normal;
font-style: normal font-style: normal
} }
......
src/locale/lang/en.js
View file @ 5406a973
...@@ -21,18 +21,18 @@ export default { ...@@ -21,18 +21,18 @@ export default {
prevMonth: 'Previous Month', prevMonth: 'Previous Month',
nextMonth: 'Next Month', nextMonth: 'Next Month',
year: '', year: '',
month1: 'Jan', month1: 'January',
month2: 'Feb', month2: 'February',
month3: 'Mar', month3: 'March',
month4: 'Apr', month4: 'April',
month5: 'May', month5: 'May',
month6: 'Jun', month6: 'June',
month7: 'Jul', month7: 'July',
month8: 'Aug', month8: 'August',
month9: 'Sep', month9: 'September',
month10: 'Oct', month10: 'October',
month11: 'Nov', month11: 'November',
month12: 'Dec', month12: 'December',
// week: 'week', // week: 'week',
weeks: { weeks: {
sun: 'Sun', sun: 'Sun',
......
src/locale/lang/ko.js
View file @ 5406a973
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
error: '올바르지 않은 입력' error: '올바르지 않은 입력'
}, },
upload: { upload: {
deleteTip: '클릭시 삭제됩니다' deleteTip: '클릭시 삭제됩니다',
delete: '삭제', delete: '삭제',
preview: '미리보기', preview: '미리보기',
continue: '계속하기' continue: '계속하기'
......
yarn.lock
View file @ 5406a973
...@@ -1302,6 +1302,13 @@ cli-width@^2.0.0: ...@@ -1302,6 +1302,13 @@ cli-width@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
cli@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
dependencies:
exit "0.1.2"
glob "^7.1.1"
cliui@^2.1.0: cliui@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
...@@ -1366,13 +1373,7 @@ collections@^0.2.0: ...@@ -1366,13 +1373,7 @@ collections@^0.2.0:
dependencies: dependencies:
weak-map "1.0.0" weak-map "1.0.0"
color-convert@^1.3.0: color-convert@^1.3.0, color-convert@^1.9.0:
version "1.8.2"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.8.2.tgz#be868184d7c8631766d54e7078e2672d7c7e3339"
dependencies:
color-name "^1.1.1"
color-convert@^1.9.0:
version "1.9.0" version "1.9.0"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
dependencies: dependencies:
...@@ -1505,7 +1506,7 @@ connect@^3.3.5: ...@@ -1505,7 +1506,7 @@ connect@^3.3.5:
parseurl "~1.3.1" parseurl "~1.3.1"
utils-merge "1.0.0" utils-merge "1.0.0"
console-browserify@^1.1.0: console-browserify@1.1.x, console-browserify@^1.1.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
dependencies: dependencies:
...@@ -2395,6 +2396,12 @@ eslint-plugin-html@*, eslint-plugin-html@^1.5.2: ...@@ -2395,6 +2396,12 @@ eslint-plugin-html@*, eslint-plugin-html@^1.5.2:
dependencies: dependencies:
htmlparser2 "^3.8.2" htmlparser2 "^3.8.2"
eslint-plugin-json@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-1.2.0.tgz#9ba73bb0be99d50093e889f5b968463d2a30efae"
dependencies:
jshint "^2.8.0"
eslint-plugin-react@*, eslint-plugin-react@^6.2.0: eslint-plugin-react@*, eslint-plugin-react@^6.2.0:
version "6.8.0" version "6.8.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.8.0.tgz#741ab5438a094532e5ce1bbb935d6832356f492d" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.8.0.tgz#741ab5438a094532e5ce1bbb935d6832356f492d"
...@@ -2548,6 +2555,10 @@ exit-hook@^1.0.0: ...@@ -2548,6 +2555,10 @@ exit-hook@^1.0.0:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
exit@0.1.2, exit@0.1.x:
version "0.1.2"
resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
expand-braces@^0.1.1: expand-braces@^0.1.1:
version "0.1.2" version "0.1.2"
resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea" resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
...@@ -3572,7 +3583,7 @@ html-webpack-plugin@^2.30.1: ...@@ -3572,7 +3583,7 @@ html-webpack-plugin@^2.30.1:
pretty-error "^2.0.2" pretty-error "^2.0.2"
toposort "^1.0.0" toposort "^1.0.0"
htmlparser2@^3.8.2, htmlparser2@~3.8.1: htmlparser2@3.8.x, htmlparser2@^3.8.2, htmlparser2@~3.8.1:
version "3.8.3" version "3.8.3"
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
dependencies: dependencies:
...@@ -4149,6 +4160,19 @@ jsesc@~0.5.0: ...@@ -4149,6 +4160,19 @@ jsesc@~0.5.0:
version "0.5.0" version "0.5.0"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
jshint@^2.8.0:
version "2.9.5"
resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.9.5.tgz#1e7252915ce681b40827ee14248c46d34e9aa62c"
dependencies:
cli "~1.0.0"
console-browserify "1.1.x"
exit "0.1.x"
htmlparser2 "3.8.x"
lodash "3.7.x"
minimatch "~3.0.2"
shelljs "0.3.x"
strip-json-comments "1.0.x"
json-loader@^0.5.4, json-loader@^0.5.7: json-loader@^0.5.4, json-loader@^0.5.7:
version "0.5.7" version "0.5.7"
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
...@@ -4724,6 +4748,10 @@ lodash.values@~2.4.1: ...@@ -4724,6 +4748,10 @@ lodash.values@~2.4.1:
dependencies: dependencies:
lodash.keys "~2.4.1" lodash.keys "~2.4.1"
lodash@3.7.x:
version "3.7.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
lodash@^3.8.0: lodash@^3.8.0:
version "3.10.1" version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
...@@ -7014,6 +7042,10 @@ shebang-regex@^1.0.0: ...@@ -7014,6 +7042,10 @@ shebang-regex@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
shelljs@0.3.x:
version "0.3.0"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
shelljs@^0.7.0, shelljs@^0.7.4, shelljs@^0.7.5: shelljs@^0.7.0, shelljs@^0.7.4, shelljs@^0.7.5:
version "0.7.5" version "0.7.5"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.5.tgz#2eef7a50a21e1ccf37da00df767ec69e30ad0675" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.5.tgz#2eef7a50a21e1ccf37da00df767ec69e30ad0675"
...@@ -7358,7 +7390,7 @@ strip-indent@^1.0.1: ...@@ -7358,7 +7390,7 @@ strip-indent@^1.0.1:
dependencies: dependencies:
get-stdin "^4.0.1" get-stdin "^4.0.1"
strip-json-comments@~1.0.1, strip-json-comments@~1.0.4: strip-json-comments@1.0.x, strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment