Skip to content

Commit d948dc8

Browse files
vanoneangvanoneang
authored
Upgrade 3.2 (#542)
* feat: upgrade element plus to release version * docs(release): Update release log
1 parent 7fd3381 commit d948dc8

File tree

19 files changed

+13928
-15622
lines changed

19 files changed

+13928
-15622
lines changed

‎.eslintrc.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ module.exports = {
66
node: true,
77
jest: true,
88
},
9-
plugins: ['vue'],
9+
plugins: ['vue', 'vuejs-accessibility'],
1010
extends: ['plugin:vue/vue3-essential', '@vue/airbnb'],
1111
rules: {
12+
'vue/script-setup-uses-vars': 'off',
1213
'vue/custom-event-name-casing': 'off',
14+
'vuejs-accessibility/rule-name': 'off',
1315
'vue/no-deprecated-slot-attribute': 'off',
1416
'vue/experimental-script-setup-vars': 'off',
1517
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
@@ -31,8 +33,10 @@ module.exports = {
3133
'class-methods-use-this': 'off',
3234
'template-curly-spacing': 'off',
3335
'arrow-parens': ['error', 'as-needed'],
36+
'vue/multi-word-component-names': 'off',
3437
'comma-dangle': ['error', 'only-multiline'],
3538
'no-param-reassign': ['error', { props: false }],
39+
'vuejs-accessibility/click-events-have-key-events': 'off',
3640
'import/no-extraneous-dependencies': ['error', { devDependencies: ['script/**/*.js'] }],
3741
indent: [
3842
'warn',
@@ -50,6 +54,6 @@ module.exports = {
5054
],
5155
},
5256
parserOptions: {
53-
parser: 'babel-eslint',
57+
parser: '@babel/eslint-parser',
5458
},
5559
}

‎README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,14 @@ QQ群搜索：Lin CMS 官方交流群 或 814597236
100100

101101
## 版本日志
102102

103-
最新版本 `0.4.2`
103+
最新版本 `0.4.3`
104+
105+
### 0.4.3
106+
107+
1. `U` 升级 `element-plus` 到 Release 版本 `2.1.4`
108+
2. `U` 升级 vue 相关依赖库版本至最新版本 `5.0.3`
109+
3. `U` 升级 `eslint` 和 `@babel/eslint-parser` 版本
110+
4. `A` 添加 `Accessibility` 相关 eslint 检查机制
104111

105112
### 0.4.2
106113

‎package-lock.json

+10,001-10,237
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lin-cms-vue",
3-
"version": "0.4.0",
3+
"version": "0.4.3",
44
"license": "MIT",
55
"scripts": {
66
"serve": "node script/plugin-get-config.js && vue-cli-service serve",
@@ -19,7 +19,7 @@
1919
"axios": "^0.24.0",
2020
"core-js": "^3.6.5",
2121
"dayjs": "^1.10.4",
22-
"element-plus": "^1.2.0-beta.5",
22+
"element-plus": "^2.1.4",
2323
"event-source-polyfill": "^1.0.7",
2424
"fastscan": "^1.0.4",
2525
"good-storage": "^1.1.0",
@@ -38,25 +38,26 @@
3838
},
3939
"devDependencies": {
4040
"@babel/core": "^7.11.4",
41+
"@babel/eslint-parser": "^7.17.0",
4142
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
4243
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
43-
"@vue/cli-plugin-babel": "~4.5.15",
44-
"@vue/cli-plugin-eslint": "~4.5.15",
45-
"@vue/cli-plugin-unit-jest": "~4.5.15",
46-
"@vue/cli-service": "~4.5.15",
47-
"@vue/compiler-sfc": "^3.0.0",
48-
"@vue/eslint-config-airbnb": "^4.0.1",
44+
"@vue/cli-plugin-babel": "^5.0.3",
45+
"@vue/cli-plugin-eslint": "^5.0.3",
46+
"@vue/cli-plugin-unit-jest": "^5.0.3",
47+
"@vue/cli-service": "^5.0.3",
48+
"@vue/compiler-sfc": "^3.2.0",
49+
"@vue/eslint-config-airbnb": "^6.0.0",
4950
"@vue/test-utils": "^2.0.0-beta.8",
50-
"babel-eslint": "^10.0.2",
5151
"babel-jest": "^26.3.0",
5252
"babel-plugin-component": "^1.1.1",
5353
"chalk": "^2.4.2",
5454
"child_process": "^1.0.2",
5555
"cz-conventional-changelog": "^2.1.0",
5656
"directory-tree": "^2.2.3",
5757
"ejs": "^2.6.2",
58-
"eslint": "^6.7.2",
59-
"eslint-plugin-vue": "^7.1.0",
58+
"eslint": "^8.11.0",
59+
"eslint-plugin-vue": "^8.5.0",
60+
"eslint-plugin-vuejs-accessibility": "^1.1.1",
6061
"fs-extra": "^8.1.0",
6162
"ignore-loader": "^0.1.2",
6263
"inquirer": "^6.5.0",
@@ -65,7 +66,7 @@
6566
"sass": "^1.26.5",
6667
"sass-loader": "^8.0.2",
6768
"semver": "^6.2.0",
68-
"shelljs": "^0.8.3",
69+
"shelljs": "^0.8.5",
6970
"validate-npm-package-name": "^3.0.0",
7071
"yaml-front-matter": "^4.0.0"
7172
},

‎src/component/base/date-picker/lin-date-picker.vue

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
start-placeholder="开始日期"
88
end-placeholder="结束日期"
99
align="right"
10-
size="medium"
1110
popper-class="date-box"
1211
:default-time="defaultTime"
1312
:shortcuts="shortcuts"

‎src/component/base/search/lin-search.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="lin-search">
3-
<el-input size="medium" :placeholder="placeholder" clearable v-model="keyword" class="input-with-select">
3+
<el-input :placeholder="placeholder" clearable v-model="keyword" class="input-with-select">
44
<template #suffix>
55
<i class="el-input__icon el-icon-search" @click="search"></i>
66
</template>

‎src/component/layout/sidebar/search.vue

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<el-select
55
clearable
66
filterable
7-
size="medium"
87
class="search"
98
v-model="sidebar"
109
ref="searchInput"

‎src/plugin/custom/view/multiple-input.vue

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<div class="lin-container">
33
<div class="lin-title">多重输入</div>
44
<div class="lin-wrap-ui">
5-
<el-card class="box-card" style="margin-bottom:50px;padding-bottom:20px;">
6-
<!-- <div class="label-title">示例</div>-->
5+
<el-card class="box-card" style="margin-bottom: 50px; padding-bottom: 20px">
76
<div class="block-box">
87
<i class="iconfont icon-jia plus" v-if="!list.length" @click="addContent"></i>
98
<el-row class="input-row" v-for="(item, index) in list" :key="index">
10-
<el-input v-model="item.text" placeholder="请输入内容" size="medium" class="input-detail"></el-input>
9+
<el-input v-model="item.text" placeholder="请输入内容" class="input-detail"></el-input>
1110
<div class="function">
1211
<i class="iconfont icon-jian1 minus" @click="removeContent(index)"></i>
1312
<i class="iconfont icon-jia plus" v-if="index === list.length - 1" @click="addContent"></i>
@@ -16,7 +15,7 @@
1615
</div>
1716
<el-collapse>
1817
<el-collapse-item title="查看代码" name="2">
19-
<div style="white-space: pre-wrap;">{{ base }}</div>
18+
<div style="white-space: pre-wrap">{{ base }}</div>
2019
</el-collapse-item>
2120
</el-collapse>
2221
</el-card>
@@ -36,7 +35,6 @@ export default {
3635
<el-input
3736
v-model="item.text"
3837
placeholder="请输入内容"
39-
size="medium"
4038
class="input-detail"
4139
></el-input>
4240
<div class="function">
@@ -123,6 +121,7 @@ export default {
123121
justify-content: space-between;
124122
width: 400px;
125123
margin-bottom: 20px;
124+
align-items: center;
126125
127126
.input-detail {
128127
width: 300px;

‎src/plugin/lin-cms-ui/view/basic/button/button.vue

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="lin-container">
33
<div class="lin-title">Button 按钮</div>
44
<div class="lin-wrap-ui">
5-
<el-card style="margin-bottom:50px;">
5+
<el-card style="margin-bottom: 50px">
66
<div slot="header"><span>基础按钮</span></div>
77
<el-row>
88
<el-button>默认按钮</el-button>
@@ -14,12 +14,12 @@
1414

1515
<el-collapse>
1616
<el-collapse-item title="查看代码" name="2">
17-
<div style="white-space: pre-wrap;">{{ primary }}</div>
17+
<div style="white-space: pre-wrap">{{ primary }}</div>
1818
</el-collapse-item>
1919
</el-collapse>
2020
</el-card>
2121

22-
<el-card style="margin-bottom:50px;">
22+
<el-card style="margin-bottom: 50px">
2323
<div slot="header"><span>朴素按钮</span></div>
2424
<el-row>
2525
<el-button plain>朴素按钮</el-button>
@@ -28,14 +28,14 @@
2828
<el-button type="warning" plain>警告按钮</el-button>
2929
<el-button type="danger" plain>危险按钮</el-button>
3030
</el-row>
31-
<el-collapse class="test" style="color:red;">
31+
<el-collapse class="test" style="color: red">
3232
<el-collapse-item title="查看代码" name="2">
33-
<div style="white-space: pre-wrap;">{{ plain }}</div>
33+
<div style="white-space: pre-wrap">{{ plain }}</div>
3434
</el-collapse-item>
3535
</el-collapse>
3636
</el-card>
3737

38-
<el-card style="margin-bottom:50px;">
38+
<el-card style="margin-bottom: 50px">
3939
<div slot="header"><span>圆形按钮</span></div>
4040
<el-row>
4141
<el-button icon="el-icon-search" circle></el-button>
@@ -51,14 +51,14 @@
5151
</el-row>
5252
<el-collapse>
5353
<el-collapse-item title="查看代码" name="2">
54-
<div style="white-space: pre-wrap;">{{ circle }}</div>
54+
<div style="white-space: pre-wrap">{{ circle }}</div>
5555
</el-collapse-item>
5656
</el-collapse>
5757
</el-card>
5858

59-
<el-card style="margin-bottom:50px;">
59+
<el-card style="margin-bottom: 50px">
6060
<div slot="header"><span>禁用状态</span></div>
61-
<el-row style="margin-bottom:10px;">
61+
<el-row style="margin-bottom: 10px">
6262
<el-button disabled>默认按钮</el-button>
6363
<el-button type="primary" disabled>主要按钮</el-button>
6464
<el-button type="success" disabled>成功按钮</el-button>
@@ -75,12 +75,12 @@
7575
</el-row>
7676
<el-collapse>
7777
<el-collapse-item title="查看代码" name="2">
78-
<div style="white-space: pre-wrap;">{{ disabled }}</div>
78+
<div style="white-space: pre-wrap">{{ disabled }}</div>
7979
</el-collapse-item>
8080
</el-collapse>
8181
</el-card>
8282

83-
<el-card style="margin-bottom:50px;">
83+
<el-card style="margin-bottom: 50px">
8484
<div slot="header"><span>图标按钮</span></div>
8585
<el-button type="primary" icon="el-icon-edit"></el-button>
8686
<el-button type="primary" icon="el-icon-share"></el-button>
@@ -89,24 +89,24 @@
8989
<el-button type="primary"> 上传 <i class="el-icon-upload el-icon--right"></i> </el-button>
9090
<el-collapse>
9191
<el-collapse-item title="查看代码" name="2">
92-
<div style="white-space: pre-wrap;">{{ icon }}</div>
92+
<div style="white-space: pre-wrap">{{ icon }}</div>
9393
</el-collapse-item>
9494
</el-collapse>
9595
</el-card>
9696

97-
<el-card style="margin-bottom:50px;">
97+
<el-card style="margin-bottom: 50px">
9898
<div slot="header"><span>加载中</span></div>
9999
<el-button type="primary" :loading="true">加载中</el-button>
100100
<el-collapse>
101101
<el-collapse-item title="查看代码" name="2">
102-
<div style="white-space: pre-wrap;">{{ loade }}</div>
102+
<div style="white-space: pre-wrap">{{ loade }}</div>
103103
</el-collapse-item>
104104
</el-collapse>
105105
</el-card>
106106

107-
<el-card style="margin-bottom:50px;">
107+
<el-card style="margin-bottom: 50px">
108108
<div slot="header"><span>按钮组</span></div>
109-
<el-button-group style="margin-right:10px;">
109+
<el-button-group style="margin-right: 10px">
110110
<el-button type="primary" icon="el-icon-arrow-left">上一页</el-button>
111111
<el-button type="primary"> 下一页 <i class="el-icon-arrow-right el-icon--right"></i> </el-button>
112112
</el-button-group>
@@ -117,28 +117,28 @@
117117
</el-button-group>
118118
<el-collapse>
119119
<el-collapse-item title="查看代码" name="2">
120-
<div style="white-space: pre-wrap;">{{ group }}</div>
120+
<div style="white-space: pre-wrap">{{ group }}</div>
121121
</el-collapse-item>
122122
</el-collapse>
123123
</el-card>
124124

125-
<el-card style="margin-bottom:50px;">
125+
<el-card style="margin-bottom: 50px">
126126
<div slot="header"><span>不同尺寸</span></div>
127127
<el-row>
128128
<el-button>默认按钮</el-button>
129129
<el-button size="medium">中等按钮</el-button>
130130
<el-button size="small">小型按钮</el-button>
131131
<el-button size="mini">超小按钮</el-button>
132132
</el-row>
133-
<el-row style="margin-top:10px;">
133+
<el-row style="margin-top: 10px">
134134
<el-button round>默认按钮</el-button>
135135
<el-button size="medium" round>中等按钮</el-button>
136136
<el-button size="small" round>小型按钮</el-button>
137137
<el-button size="mini" round>超小按钮</el-button>
138138
</el-row>
139139
<el-collapse>
140140
<el-collapse-item title="查看代码" name="2">
141-
<div style="white-space: pre-wrap;">{{ size }}</div>
141+
<div style="white-space: pre-wrap">{{ size }}</div>
142142
</el-collapse-item>
143143
</el-collapse>
144144
</el-card>
@@ -153,7 +153,7 @@ export default {
153153
data() {
154154
return {
155155
text: '',
156-
primary: `
156+
primary: `
157157
<el-button>默认按钮</el-button>
158158
<el-button type="primary">主要按钮</el-button>
159159
<el-button type="success">成功按钮</el-button>
@@ -171,7 +171,7 @@ export default {
171171
<el-button type="success" icon="el-icon-check" circle></el-button>
172172
<el-button type="warning" icon="el-icon-star-off" circle></el-button>
173173
<el-button type="danger" icon="el-icon-delete" circle></el-button>
174-
174+
175175
<el-button icon="el-icon-search" plain circle></el-button>
176176
<el-button type="primary" icon="el-icon-edit" plain circle></el-button>
177177
<el-button type="success" icon="el-icon-check" plain circle></el-button>

‎src/plugin/lin-cms-ui/view/form/multiple-input.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="lin-container">
33
<div class="lin-title">多重输入框</div>
44
<div class="lin-wrap-ui">
5-
<el-card class="box-card" style="margin-bottom:50px;padding-bottom:20px;">
5+
<el-card class="box-card" style="margin-bottom: 50px; padding-bottom: 20px">
66
<div class="label-title">示例</div>
77
<div class="block-box">
88
<i class="iconfont icon-jia plus" v-if="!list.length" @click="addContent"></i>
@@ -16,7 +16,7 @@
1616
</div>
1717
<el-collapse>
1818
<el-collapse-item title="查看代码" name="2">
19-
<div style="white-space: pre-wrap;">{{ base }}</div>
19+
<div style="white-space: pre-wrap">{{ base }}</div>
2020
</el-collapse-item>
2121
</el-collapse>
2222
</el-card>
@@ -36,7 +36,6 @@ export default {
3636
<el-input
3737
v-model="item.text"
3838
placeholder="请输入内容"
39-
size="medium"
4039
class="input-detail"
4140
></el-input>
4241
<div class="function">
@@ -99,6 +98,7 @@ export default {
9998
justify-content: space-between;
10099
width: 400px;
101100
margin-bottom: 20px;
101+
align-items: center;
102102
103103
.input-detail {
104104
width: 300px;

‎src/view/admin/group/group-create.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
@submit.prevent
1616
>
1717
<el-form-item label="分组名称" prop="name">
18-
<el-input size="medium" clearable v-model="group.name"></el-input>
18+
<el-input clearable v-model="group.name"></el-input>
1919
</el-form-item>
2020
<el-form-item label="分组描述" prop="info">
21-
<el-input size="medium" clearable v-model="group.info"></el-input>
21+
<el-input clearable v-model="group.info"></el-input>
2222
</el-form-item>
2323
<el-form-item>
2424
<group-permissions title="分配权限" ref="groupPermissions" @updatePermissions="updatePermissions">

0 commit comments

Comments
 (0)