Skip to content

Commit 305fdd0

Browse files
jw-fossjw-foss
authored
Merge branch 'dev' into bugfix/drawer-append-to-body-not-working
2 parents a4f1c72 + 77c77ef commit 305fdd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1031
-182
lines changed

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"globals": {
3-
"ga": true
3+
"ga": true,
4+
"chrome": true
45
},
56
"plugins": ["html", "json"],
67
"extends": "elemefe",

‎CHANGELOG.es.md

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,64 @@
44

55
*2019-07-26*
66

7-
#### Bug fixes
7+
#### Corrección de errores
88

99
- Image
10-
- Fix Image component SSR compatibility (#16737 by @luckyCao)
11-
- Chore
12-
- Update dart-sass compatibility (#16744 by @LewisChennnnn)
10+
- Corregido el componente Image para compatibilidad SSR (#16737 by @luckyCao)
11+
- Tarea
12+
- Actualizado para compatibilidad con dart-sass by @LewisChennnnn)
1313

1414
### 2.11.0
1515

1616
*2019-07-25*
1717

18-
#### New features
18+
#### Nuevas características
1919

2020
- Drawer
21-
- Add drawer component (#16577 by @JeremyWuuuuu)
21+
- Agregado componente drawer (#16577 by @JeremyWuuuuu)
2222

23-
#### Bug fixes
23+
#### Corrección de errores
2424

2525
- Checkbox
26-
- Enhance css selector (#16006 by @Hazlank)
26+
- Mejora del selector css (#16006 by @Hazlank)
2727
- Tree
28-
- Make el-tree generic (#15934 by @JeremyWuuuuu)
29-
- Set isCurrent prop to False (#15870 by @kkkisme)
28+
- Establecido el el-tree como genérico (#15934 by @JeremyWuuuuu)
29+
- Establecido la prop isCurrent como False (#15870 by @kkkisme)
3030
- Dropdown
31-
- Fix split-button caret default color (#15931 by @JuniorTour)
31+
- Corregido el color predeterminado de los split-button (#15931 by @JuniorTour)
3232
- Cascader
33-
- Fix level 1 children is empty update problem (#16399 by @luckyCao)
34-
- Display correct header when range is specified (#16354 by @ziyoung)
35-
- Add sets default values when lazy is true (#16420 by @luckyCao)
36-
- Fix display errors when node value is duplicate (#15935 by @junyiz)
37-
- Expose getCheckedNodes and fix options change bug (#16709 by @SimonaliaChen)
38-
- Calendar
39-
- Display correct header when range is specified (#16354 by @ziyoung)
33+
- Corregido un problema de actualización cuando el nivel 1 de children estaba vació (#16399 by @luckyCao)
34+
- Ahora se muestra correctamente header cuando range esta especificado (#16354 by @ziyoung)
35+
- Agregados valores por defecto cuando lazy es true (#16420 by @luckyCao)
36+
- Solucionado problemas de visualización (#15935 by @junyiz)
37+
- Expuestos los getCheckedNodes y corrección de errores en el cambio de opciones (#16709 by @SimonaliaChen)
4038
- Submenu
41-
- Fix prop append-to-body (#16289 by @a631807682)
39+
- Corregida la prop append-to-body (#16289 by @a631807682)
4240
- Table
43-
- Fix tree table when updating data (#16481 by @island205)
41+
- Arreglado un fallo en la actualizacion de los datos de tree table (#16481 by @island205)
4442
- Select
45-
- Fix memory leak issue (#16463 by @island205)
43+
- Arreglado un problema de fuga de memoria (#16463 by @island205)
4644
- InfiniteScroll
47-
- Update naming & doc (#16698 by @iamkun)
45+
- Actualizada la nomenclatura y la documentacion (#16698 by @iamkun)
4846
- Avatar
49-
- Fix image not center vertically issue (#16489 by @luckyCao)
47+
- Arreglado que la imagen no se centraba verticalmente (#16489 by @luckyCao)
5048
- Dialog
51-
- Add destroyOnClose attribute (#16455 by @ziyoung)
49+
- Agregado el atributo destroyOnClosee (#16455 by @ziyoung)
5250
- Image
53-
- Add big Image preview feature (#16333 by @luckyCao)
51+
- Agregada la función de vista previa grande de imágenes (#16333 by @luckyCao)
5452

55-
#### Optimization
53+
#### Optimización
5654

57-
- Docs
58-
- Fix dropdown demo (#16193 by @webxmsj)
59-
- Fix typo in table documents (#15971 by @howiefh)
55+
- Documentación
56+
- Arreglada la demo de dropdown (#16193 by @webxmsj)
57+
- Corrección de errores tipográficos en las tablas de documentos (#15971 by @howiefh)
6058
- I18n
61-
- Update translation of Thai language (#16689 by @ponkrit)
62-
- Chore
63-
- Update theme base api (#16607 by @iamkun)
64-
- Add form theme token (#16699 by @iamkun)
65-
- Mark ali inner user's access (#16609 by @iamkun)
66-
- Fix doc anchor bug (#16692 by @iamkun)
59+
- Actualizada la traduccion del lenguage Thai (#16689 by @ponkrit)
60+
- Tareas
61+
- Actualizada la api base del tema (#16607 by @iamkun)
62+
- Añadido token del formulario del tema (#16699 by @iamkun)
63+
- Marcar todos los accesos internos del usuario (#16609 by @iamkun)
64+
- Corrección del error de anclaje del documento (#16692 by @iamkun)
6765

6866
### 2.10.1
6967

‎build/webpack.extension.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
const path = require('path');
2+
const CopyWebpackPlugin = require('copy-webpack-plugin');
3+
const demoConfig = require('./webpack.demo');
4+
const webpack = require('webpack');
5+
const ProgressBarPlugin = require('progress-bar-webpack-plugin');
6+
const VueLoaderPlugin = require('vue-loader/lib/plugin');
7+
8+
demoConfig.entry = {
9+
background: path.join(process.cwd(), './examples/extension/src/background'),
10+
entry: path.join(process.cwd(), './examples/extension/src/entry')
11+
};
12+
demoConfig.output = {
13+
path: path.join(process.cwd(), './examples/extension/dist'),
14+
filename: '[name].js'
15+
};
16+
demoConfig.plugins = [
17+
new CopyWebpackPlugin([
18+
{ from: 'examples/extension/src/manifest.json' },
19+
{ from: 'examples/extension/src/icon.png' }
20+
]),
21+
new VueLoaderPlugin(),
22+
new ProgressBarPlugin(),
23+
new webpack.LoaderOptionsPlugin({
24+
vue: {
25+
compilerOptions: {
26+
preserveWhitespace: false
27+
}
28+
}
29+
}),
30+
new webpack.HotModuleReplacementPlugin()
31+
];
32+
demoConfig.module.rules.find(a => a.loader === 'url-loader').query = {};
33+
module.exports = demoConfig;

‎examples/components/theme-configurator/editor/borderRadius.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

‎examples/components/theme-configurator/editor/boxShadow.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
<el-button

‎examples/components/theme-configurator/editor/color.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

‎examples/components/theme-configurator/editor/fontLineHeight.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

‎examples/components/theme-configurator/editor/fontSize.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

‎examples/components/theme-configurator/editor/fontWeight.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

‎examples/components/theme-configurator/editor/simpleText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section class="config" :key="displayName">
33
<div class="config-label">
4-
<el-tooltip :content="displayName">
4+
<el-tooltip :content="displayName" placement="top">
55
<span>{{displayKeyName}}</span>
66
</el-tooltip>
77
</div>

0 commit comments

Comments
 (0)