mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-07 01:55:15 +00:00
Compare commits
75 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2e964d953 | ||
|
|
0ad4945b10 | ||
|
|
fcdd090e2d | ||
|
|
e47ddb5355 | ||
|
|
56aa3caa83 | ||
|
|
19b1dc0dbc | ||
|
|
77ef172a23 | ||
|
|
4596887bf1 | ||
|
|
0a3dc30c85 | ||
|
|
51d24bc8e5 | ||
|
|
1b15a4d043 | ||
|
|
7d3f818242 | ||
|
|
4e26f18d77 | ||
|
|
b22613617a | ||
|
|
e971cbf4a8 | ||
|
|
4672abae35 | ||
|
|
ba36d72602 | ||
|
|
4bfbbba4c5 | ||
|
|
ea038ce43a | ||
|
|
e16b19666c | ||
|
|
c7f5409eb6 | ||
|
|
fdbd7d2222 | ||
|
|
ddbaeeafea | ||
|
|
efb0e9dacb | ||
|
|
f6f8301ad5 | ||
|
|
9a63ae63d4 | ||
|
|
1e007ccda3 | ||
|
|
d1d0b06b53 | ||
|
|
5fb70d2f24 | ||
|
|
b54a95430f | ||
|
|
4d8b4c45af | ||
|
|
a6d642df60 | ||
|
|
2e74f1522f | ||
|
|
fe615e0314 | ||
|
|
09f734e6fc | ||
|
|
3117046342 | ||
|
|
b68aecb5cc | ||
|
|
1c9b155d97 | ||
|
|
75b1be9864 | ||
|
|
615c3c1cf4 | ||
|
|
4d82231af4 | ||
|
|
c6cf6571b6 | ||
|
|
8ea990d070 | ||
|
|
f4a32170d5 | ||
|
|
073508675e | ||
|
|
1d6ca0a93a | ||
|
|
36aea652d6 | ||
|
|
1a42ce90ab | ||
|
|
31a401b55d | ||
|
|
582a84178d | ||
|
|
9b9f7c936c | ||
|
|
2a6100957f | ||
|
|
16606d6a27 | ||
|
|
0a612f50e6 | ||
|
|
fe36fa9390 | ||
|
|
ba109900ec | ||
|
|
ec7768267f | ||
|
|
cc58b374ab | ||
|
|
04ffbb8fd6 | ||
|
|
49880f6739 | ||
|
|
e6f98d58c4 | ||
|
|
fd1f16d43c | ||
|
|
968b2415b1 | ||
|
|
776090d6ba | ||
|
|
3a37952288 | ||
|
|
62b8fc0e3b | ||
|
|
b2028869cb | ||
|
|
5277a725f8 | ||
|
|
f137788c1a | ||
|
|
f7d17c8de7 | ||
|
|
feea70b0be | ||
|
|
04696ef3d6 | ||
|
|
1731f4f788 | ||
|
|
6f25d93909 | ||
|
|
46461ec324 |
src
components
Table
TagSearch
layout
components
views
ops
Job
Template
@@ -234,10 +234,12 @@ export default {
|
|||||||
delete routeFilter.search
|
delete routeFilter.search
|
||||||
}
|
}
|
||||||
const asFilterTags = _.cloneDeep(this.filterTags)
|
const asFilterTags = _.cloneDeep(this.filterTags)
|
||||||
|
setTimeout(() => {
|
||||||
this.filterTags = {
|
this.filterTags = {
|
||||||
...asFilterTags,
|
...asFilterTags,
|
||||||
...routeFilter
|
...routeFilter
|
||||||
}
|
}
|
||||||
|
}, 100)
|
||||||
},
|
},
|
||||||
getValueLabel(key, value) {
|
getValueLabel(key, value) {
|
||||||
for (const field of this.options) {
|
for (const field of this.options) {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.app-main {
|
.app-main {
|
||||||
background-color: #f3f3f4;
|
background-color: #f3f3f4;
|
||||||
height: 100% !important;
|
height: 100vh !important;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|||||||
@@ -116,8 +116,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.page {
|
.page {
|
||||||
height: calc(100vh - 50px);
|
overflow-y: hidden;
|
||||||
//overflow-y: hidden;
|
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|
||||||
.el-alert {
|
.el-alert {
|
||||||
@@ -127,9 +126,8 @@ export default {
|
|||||||
|
|
||||||
.page-content {
|
.page-content {
|
||||||
height: calc(100% - 20px);
|
height: calc(100% - 20px);
|
||||||
//Todo)) 注释掉的原因:当页面动态高度变化时就会导致页面最下方的按钮被 hidden 掉
|
overflow-x: hidden;
|
||||||
//overflow-x: hidden;
|
overflow-y: auto !important;
|
||||||
//overflow-y: auto !important;
|
|
||||||
|
|
||||||
::v-deep > div {
|
::v-deep > div {
|
||||||
margin-bottom: 50px;
|
margin-bottom: 50px;
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ export default {
|
|||||||
data?.variable.map(item => {
|
data?.variable.map(item => {
|
||||||
delete item.job
|
delete item.job
|
||||||
delete item.playbook
|
delete item.playbook
|
||||||
|
delete item.id
|
||||||
return item
|
return item
|
||||||
})
|
})
|
||||||
updateForm({ variable: data.variable })
|
updateForm({ variable: data.variable })
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :md="16" :sm="24">
|
<el-col :md="16" :sm="24">
|
||||||
<AutoDetailCard :fields="detailFields" :object="object" :url="url" />
|
<AutoDetailCard :excludes="excludes" :object="object" :url="url" />
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</template>
|
</template>
|
||||||
@@ -21,7 +21,8 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
url: `/api/v1/ops/adhocs/${this.object.id}/`
|
url: `/api/v1/ops/adhocs/${this.object.id}/`,
|
||||||
|
excludes: ['variable']
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
url: `/api/v1/ops/playbooks/${this.object.id}/`,
|
url: `/api/v1/ops/playbooks/${this.object.id}/`,
|
||||||
excludes: [
|
excludes: [
|
||||||
'path', 'create_method', 'vcs_url'
|
'variable', 'path', 'create_method', 'vcs_url'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user