Skip to content

Commit d319cf1

Browse files
authored
Opt 036 (#338)
* refactor(*): upgrade to version 0.3.6 * refactor(axios): optimize code * fix(Fix table component cannot be centered issue): fix #337 * docs: update readme
1 parent 026f71f commit d319cf1

File tree

7 files changed

+33
-20
lines changed

7 files changed

+33
-20
lines changed

Diff for: .eslintrc.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = {
99
plugins: ['vue'],
1010
extends: ['plugin:vue/essential', '@vue/airbnb'],
1111
rules: {
12+
'max-len': 0,
1213
camelcase: 0, // 变量可以用下划线
1314
'no-plusplus': 0, // 禁止使用++,--
1415
'guard-for-in': 0,
@@ -17,12 +18,10 @@ module.exports = {
1718
'import/no-unresolved': 0,
1819
'no-underscore-dangle': 0, // 无下划线
1920
'no-restricted-syntax': 0,
20-
'no-restricted-syntax': 0,
2121
'consistent-return': 'off',
22+
semi: ['error', 'never'],
2223
'no-prototype-builtins': 'off',
2324
'class-methods-use-this': 'off',
24-
semi: ['error', 'never'], // 无分号
25-
'max-len': ['error', { code: 200 }],
2625
'arrow-parens': ['error', 'as-needed'],
2726
'comma-dangle': ['error', 'only-multiline'],
2827
'no-param-reassign': ['error', { props: false }],

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ QQ群搜索:Lin CMS 官方交流群 或 814597236
106106
1. `F` 修复一级菜单双击报错
107107
2. `U` 统一不同编辑器换行符
108108
3. `U` 内容提交使用“加载中”按钮
109+
4. `F` 修复Table组件不能居中问题
110+
5. `F` 编辑用户时,至少选择一个分组
109111

110112
### 0.3.5
111113

Diff for: src/assets/style/realize/element-variable.scss

+1-8
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,6 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
277277
}
278278
}
279279

280-
.el-table .cell {
281-
display: flex;
282-
margin-top: 2px;
283-
margin-bottom: 2px;
284-
padding-left: 20px;
285-
}
286-
287280
.el-table thead tr th .cell {
288281
color: #333;
289282
font-weight: 500;
@@ -911,4 +904,4 @@ $typeMap: (primary:#3963BC,
911904
@include e(title) {
912905
color: #333333;
913906
}
914-
}
907+
}

Diff for: src/lin/plugin/axios.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ const config = {
1818
},
1919
}
2020

21+
/**
22+
* 错误码是否是refresh相关
23+
* @param {number} code 错误码
24+
*/
25+
function refreshTokenException(code) {
26+
let flag = false
27+
const codes = [10000, 10042, 10050, 10052]
28+
if (codes.includes(code)) {
29+
flag = true
30+
}
31+
return flag
32+
}
33+
2134
// const retryTime = 2 // 请求失败重试次数
2235
// const retryDelay = 1500 // 请求失败重试间隔
2336

@@ -117,7 +130,7 @@ _axios.interceptors.response.use(
117130
const { url } = res.config
118131

119132
// refreshToken相关,直接登出
120-
if (code === 10000 || code === 10042 || code === 10052) {
133+
if (refreshTokenException(code)) {
121134
setTimeout(() => {
122135
store.dispatch('loginOut')
123136
const { origin } = window.location

Diff for: src/plugin/lin-cms-ui/view/table/table.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<div slot="header"><span>基础表格</span></div>
77
<el-row>
88
<el-table :data="tableData" style="width: 100%" stripe>
9-
<el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
10-
<el-table-column prop="name" label="姓名" width="120"></el-table-column>
11-
<el-table-column prop="province" label="省份" width="120"></el-table-column>
12-
<el-table-column prop="city" label="市区" width="120"></el-table-column>
13-
<el-table-column prop="zip" label="邮编" width="120"></el-table-column>
14-
<el-table-column prop="address" label="地址"></el-table-column>
9+
<el-table-column align="center" fixed prop="date" label="日期" width="150"></el-table-column>
10+
<el-table-column align="center" prop="name" label="姓名" width="120"></el-table-column>
11+
<el-table-column align="center" prop="province" label="省份" width="120"></el-table-column>
12+
<el-table-column align="center" prop="city" label="市区" width="120"></el-table-column>
13+
<el-table-column align="center" prop="zip" label="邮编" width="120"></el-table-column>
14+
<el-table-column align="center" prop="address" label="地址"></el-table-column>
1515
</el-table>
1616
</el-row>
1717
<el-collapse>

Diff for: src/view/admin/user/user-info.vue

+4
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ export default {
182182
return
183183
}
184184
try {
185+
if (!this.form.group_ids.length) {
186+
this.$message.error('至少选择一个分组')
187+
return
188+
}
185189
this.loading = true
186190
res = await Admin.updateOneUser(this.form.email, this.form.group_ids, this.id)
187191
} catch (e) {

Diff for: src/view/admin/user/user-list.vue

+4-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ export default {
214214
},
215215
// 切换tab栏
216216
handleClick(tab) {
217-
console.log(tab)
218217
this.activeTab = tab.name
219218
},
220219
// 监听子组件更新用户信息是否成功
@@ -260,7 +259,10 @@ export default {
260259
async created() {
261260
await this.getAdminUsers()
262261
this.getAllGroups()
263-
this.tableColumn = [{ prop: 'username', label: '名称' }, { prop: 'groupNames', label: '所属分组' }] // 设置表头信息
262+
this.tableColumn = [
263+
{ prop: 'username', label: '名称' },
264+
{ prop: 'groupNames', label: '所属分组' },
265+
] // 设置表头信息
264266
this.operate = [
265267
{ name: '编辑', func: 'handleEdit', type: 'primary' },
266268
{ name: '删除', func: 'handleDelete', type: 'danger' },

0 commit comments

Comments
 (0)