Skip to content

Commit

Permalink
releases 1.1.3
Browse files Browse the repository at this point in the history
releases 1.1.3
  • Loading branch information
wenjianzhang authored Aug 12, 2020
2 parents 1ec5e15 + 73ba66f commit 56b6942
Show file tree
Hide file tree
Showing 31 changed files with 1,228 additions and 134 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"normalize.css": "8.0.1",
"nprogress": "0.2.0",
"path-to-regexp": "6.1.0",
"sass-resources-loader": "^2.0.3",
"screenfull": "5.0.2",
"showdown": "^1.9.1",
"solarlunar": "^2.0.7",
Expand All @@ -72,10 +73,11 @@
"vue-count-to": "1.0.13",
"vue-cropper": "^0.5.5",
"vue-particles": "^1.0.9",
"vue-router": "3.4.1",
"vue-router": "3.4.2",
"vue-splitpane": "1.0.6",
"vuedraggable": "2.24.0",
"vuex": "3.5.1",
"webpack-bundle-analyzer": "^3.8.0",
"xlsx": "0.16.5"
},
"devDependencies": {
Expand All @@ -93,6 +95,7 @@
"beautifier": "^0.1.7",
"chalk": "4.1.0",
"chokidar": "3.4.2",
"compression-webpack-plugin": "^4.0.0",
"connect": "3.7.0",
"eslint": "7.6.0",
"eslint-plugin-vue": "6.2.2",
Expand Down
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
height: 100%;
margin: 0px;
padding: 0px;
background: #f0f1f5;
}

.chromeframe {
Expand Down
61 changes: 61 additions & 0 deletions src/api/sysjob.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import request from '@/utils/request'

// 查询SysJob列表
export function listSysJob(query) {
return request({
url: '/api/v1/sysjob',
method: 'get',
params: query
})
}

// 查询SysJob详细
export function getSysJob(jobId) {
return request({
url: '/api/v1/sysjob/' + jobId,
method: 'get'
})
}

// 新增SysJob
export function addSysJob(data) {
return request({
url: '/api/v1/sysjob',
method: 'post',
data: data
})
}

// 修改SysJob
export function updateSysJob(data) {
return request({
url: '/api/v1/sysjob',
method: 'put',
data: data
})
}

// 删除SysJob
export function delSysJob(jobId) {
return request({
url: '/api/v1/sysjob/' + jobId,
method: 'get'
})
}

// 移除SysJob
export function removeJob(jobId) {
return request({
url: '/api/v1/job/remove/' + jobId,
method: 'get'
})
}

// 启动SysJob
export function startJob(jobId) {
return request({
url: '/api/v1/job/start/' + jobId,
method: 'get'
})
}

13 changes: 13 additions & 0 deletions src/api/tools/gen.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,17 @@ export function toProjectTable(tableId) {
method: 'get'
})
}
export function toProjectTableCheckRole(tableId, ischeckrole) {
return request({
url: '/api/v1/gen/toproject/' + tableId + '?ischeckrole=' + ischeckrole,
method: 'get'
})
}

// 生成菜单到数据库
export function toDBTable(tableId) {
return request({
url: '/api/v1/gen/todb/' + tableId,
method: 'get'
})
}
39 changes: 39 additions & 0 deletions src/assets/dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/assets/light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions src/components/Screenfull/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ export default {
},
methods: {
click() {
if (!screenfull.enabled) {
this.$message({
message: 'you browser can not work',
type: 'warning'
})
return false
}
// if (!screenfull.enabled) {
// this.$message({
// message: 'you browser can not work',
// type: 'warning'
// })
// return false
// }
screenfull.toggle()
},
change() {
Expand Down
7 changes: 2 additions & 5 deletions src/components/ThemePicker/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<script>
const version = require('element-ui/package.json').version // element-ui version from node_modules
const ORIGINAL_THEME = '#409EFF' // default color
const ORIGINAL_THEME = '#1890FF' // default color
export default {
data() {
Expand All @@ -35,10 +35,9 @@ export default {
if (typeof val !== 'string') return
const themeCluster = this.getThemeCluster(val.replace('#', ''))
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
console.log(themeCluster, originalCluster)
const $message = this.$message({
message: ' Compiling the theme',
message: '编译主题中',
customClass: 'theme-message',
type: 'success',
duration: 0,
Expand Down Expand Up @@ -79,9 +78,7 @@ export default {
if (typeof innerText !== 'string') return
style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
})
this.$emit('change', val)
$message.close()
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/layout/components/AppMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export default {
.hasTagsView {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
min-height: calc(100vh - 93px);
}
.fixed-header+.app-main {
padding-top: 84px;
padding-top: 93px;
}
}
</style>
Expand Down
Loading

0 comments on commit 56b6942

Please sign in to comment.