Skip to content

Commit 56b6942

Browse files
authored
releases 1.1.3
releases 1.1.3
2 parents 1ec5e15 + 73ba66f commit 56b6942

File tree

31 files changed

+1228
-134
lines changed

31 files changed

+1228
-134
lines changed

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"normalize.css": "8.0.1",
6363
"nprogress": "0.2.0",
6464
"path-to-regexp": "6.1.0",
65+
"sass-resources-loader": "^2.0.3",
6566
"screenfull": "5.0.2",
6667
"showdown": "^1.9.1",
6768
"solarlunar": "^2.0.7",
@@ -72,10 +73,11 @@
7273
"vue-count-to": "1.0.13",
7374
"vue-cropper": "^0.5.5",
7475
"vue-particles": "^1.0.9",
75-
"vue-router": "3.4.1",
76+
"vue-router": "3.4.2",
7677
"vue-splitpane": "1.0.6",
7778
"vuedraggable": "2.24.0",
7879
"vuex": "3.5.1",
80+
"webpack-bundle-analyzer": "^3.8.0",
7981
"xlsx": "0.16.5"
8082
},
8183
"devDependencies": {
@@ -93,6 +95,7 @@
9395
"beautifier": "^0.1.7",
9496
"chalk": "4.1.0",
9597
"chokidar": "3.4.2",
98+
"compression-webpack-plugin": "^4.0.0",
9699
"connect": "3.7.0",
97100
"eslint": "7.6.0",
98101
"eslint-plugin-vue": "6.2.2",

public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
height: 100%;
1919
margin: 0px;
2020
padding: 0px;
21+
background: #f0f1f5;
2122
}
2223

2324
.chromeframe {

src/api/sysjob.js

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import request from '@/utils/request'
2+
3+
// 查询SysJob列表
4+
export function listSysJob(query) {
5+
return request({
6+
url: '/api/v1/sysjob',
7+
method: 'get',
8+
params: query
9+
})
10+
}
11+
12+
// 查询SysJob详细
13+
export function getSysJob(jobId) {
14+
return request({
15+
url: '/api/v1/sysjob/' + jobId,
16+
method: 'get'
17+
})
18+
}
19+
20+
// 新增SysJob
21+
export function addSysJob(data) {
22+
return request({
23+
url: '/api/v1/sysjob',
24+
method: 'post',
25+
data: data
26+
})
27+
}
28+
29+
// 修改SysJob
30+
export function updateSysJob(data) {
31+
return request({
32+
url: '/api/v1/sysjob',
33+
method: 'put',
34+
data: data
35+
})
36+
}
37+
38+
// 删除SysJob
39+
export function delSysJob(jobId) {
40+
return request({
41+
url: '/api/v1/sysjob/' + jobId,
42+
method: 'get'
43+
})
44+
}
45+
46+
// 移除SysJob
47+
export function removeJob(jobId) {
48+
return request({
49+
url: '/api/v1/job/remove/' + jobId,
50+
method: 'get'
51+
})
52+
}
53+
54+
// 启动SysJob
55+
export function startJob(jobId) {
56+
return request({
57+
url: '/api/v1/job/start/' + jobId,
58+
method: 'get'
59+
})
60+
}
61+

src/api/tools/gen.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,17 @@ export function toProjectTable(tableId) {
6464
method: 'get'
6565
})
6666
}
67+
export function toProjectTableCheckRole(tableId, ischeckrole) {
68+
return request({
69+
url: '/api/v1/gen/toproject/' + tableId + '?ischeckrole=' + ischeckrole,
70+
method: 'get'
71+
})
72+
}
6773

74+
// 生成菜单到数据库
75+
export function toDBTable(tableId) {
76+
return request({
77+
url: '/api/v1/gen/todb/' + tableId,
78+
method: 'get'
79+
})
80+
}

src/assets/dark.svg

Lines changed: 39 additions & 0 deletions
Loading

src/assets/light.svg

Lines changed: 39 additions & 0 deletions
Loading

src/assets/logo/logo.png

-3.25 KB
Loading

src/components/Screenfull/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ export default {
2222
},
2323
methods: {
2424
click() {
25-
if (!screenfull.enabled) {
26-
this.$message({
27-
message: 'you browser can not work',
28-
type: 'warning'
29-
})
30-
return false
31-
}
25+
// if (!screenfull.enabled) {
26+
// this.$message({
27+
// message: 'you browser can not work',
28+
// type: 'warning'
29+
// })
30+
// return false
31+
// }
3232
screenfull.toggle()
3333
},
3434
change() {

src/components/ThemePicker/index.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<script>
1111
const version = require('element-ui/package.json').version // element-ui version from node_modules
12-
const ORIGINAL_THEME = '#409EFF' // default color
12+
const ORIGINAL_THEME = '#1890FF' // default color
1313
1414
export default {
1515
data() {
@@ -35,10 +35,9 @@ export default {
3535
if (typeof val !== 'string') return
3636
const themeCluster = this.getThemeCluster(val.replace('#', ''))
3737
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
38-
console.log(themeCluster, originalCluster)
3938
4039
const $message = this.$message({
41-
message: ' Compiling the theme',
40+
message: '编译主题中',
4241
customClass: 'theme-message',
4342
type: 'success',
4443
duration: 0,
@@ -79,9 +78,7 @@ export default {
7978
if (typeof innerText !== 'string') return
8079
style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
8180
})
82-
8381
this.$emit('change', val)
84-
8582
$message.close()
8683
}
8784
},

src/layout/components/AppMain.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ export default {
3838
.hasTagsView {
3939
.app-main {
4040
/* 84 = navbar + tags-view = 50 + 34 */
41-
min-height: calc(100vh - 84px);
41+
min-height: calc(100vh - 93px);
4242
}
4343
4444
.fixed-header+.app-main {
45-
padding-top: 84px;
45+
padding-top: 93px;
4646
}
4747
}
4848
</style>

0 commit comments

Comments
 (0)