test/element
1
0
Fork 0
mirror of https://gitee.com/ElemeFE/element.git synced 2024-11-29 18:57:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Chore: misc updates

Browse Source
This commit is contained in:
Leopoldthecoder 2017-12-11 10:43:45 +08:00 committed by 杨奕
parent 8ae2defa2d
commit 1fb98ef172
8 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/bin/build-entry.js
View File

@ -20,8 +20,6 @@ const components = [
];
const install = function(Vue, opts = {}) {
/* istanbul ignore if */
if (install.installed) return;
locale.use(opts.locale);
locale.i18n(opts.i18n);

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.11': '1.4' };
var content = { '1.4.12': '1.4' };
if (!content[version]) content[version] = '2.0';
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

2
examples/docs/zh-CN/table.md
View File

@ -1777,7 +1777,7 @@
### 合并行或列
多行或多列共用一个数据时，可以合并行或列。
:::demo 通过给`table`传入`span-method`方法可以实现合并行或列，方法的参数是一个对象，里面包含当前行`row`、当前列`column`、当前行号`rowIndex`、当前列号`columnIndex`四个属性。该函数可以返回一个包含两个元素的数组，第一个元素代表`rowspan`，第二个元素代表`colspan`。 也可以返回一个键名为`rowsapn`和`colspan`的对象。
:::demo 通过给`table`传入`span-method`方法可以实现合并行或列，方法的参数是一个对象，里面包含当前行`row`、当前列`column`、当前行号`rowIndex`、当前列号`columnIndex`四个属性。该函数可以返回一个包含两个元素的数组，第一个元素代表`rowspan`，第二个元素代表`colspan`。 也可以返回一个键名为`rowspan`和`colspan`的对象。
```html
<template>

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.11":"1.4","2.0.7":"2.0"}
{"1.4.12":"1.4","2.0.7":"2.0"}

4
packages/theme-chalk/src/common/var.scss
View File

@ -25,8 +25,8 @@ $--color-primary-light-7: mix($--color-white, $--color-primary, 70%) !default; /
$--color-primary-light-8: mix($--color-white, $--color-primary, 80%) !default; /* d9ecff */
$--color-primary-light-9: mix($--color-white, $--color-primary, 90%) !default; /* ecf5ff */
$--color-success: #67c23a !default;
$--color-warning: #eb9e05 !default;
$--color-success: #5cb87a !default;
$--color-warning: #e6a23c !default;
$--color-danger: #fa5555 !default;
$--color-info: #878d99 !default;

1
packages/theme-chalk/src/menu.scss
View File

@ -171,6 +171,7 @@
width: 24px;
text-align: center;
font-size: 18px;
vertical-align: middle;
}
& * {
vertical-align: middle;

1
packages/theme-chalk/src/table.scss
View File

@ -434,6 +434,7 @@
vertical-align: middle;
cursor: pointer;
overflow: initial;
position: relative;
}
.sort-caret {

2
src/index.js
View File

@ -142,8 +142,6 @@ const components = [
];
const install = function(Vue, opts = {}) {
/* istanbul ignore if */
if (install.installed) return;
locale.use(opts.locale);
locale.i18n(opts.i18n);