center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #913 from dataease/pr@dev@style_theme_dark

Browse Source 
Pr@dev@style theme dark
This commit is contained in:
fit2cloud-chenyw 2021-10-12 16:38:44 +08:00 committed by GitHub
commit 9f4c1af114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/styles/index.scss
View File

@ -427,6 +427,10 @@ div:focus {
border: none !important; border: none !important;
} }
.blackTheme .el-picker-panel__footer {
background-color: var(--MainBG) !important;
}
.el-pagination { .el-pagination {
button:disabled { button:disabled {
@ -611,6 +615,10 @@ div:focus {
background-color: #000000 ; background-color: #000000 ;
} }
.blackTheme .CodeMirror-line {
background-color: #000000 !important;
}
.blackTheme .el-radio-button__inner { .blackTheme .el-radio-button__inner {
background-color: var(--TableBG); background-color: var(--TableBG);
color: var(--TableColor); color: var(--TableColor);

2
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -613,7 +613,7 @@
:fullscreen="true" :fullscreen="true"
> >
<field-edit :param="table" /> <field-edit :param="table" />
<div slot="title" class="dialog-footer"> <div slot="title" class="dialog-footer title-text">
<span style="font-size: 14px;"> <span style="font-size: 14px;">
{{ $t('dataset.field_manage') }} {{ $t('dataset.field_manage') }}
<span v-if="table">[{{ table.name }}]</span> <span v-if="table">[{{ table.name }}]</span>

14
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -96,7 +96,7 @@
append-to-body append-to-body
> >
<el-col> <el-col>
<el-form :form="taskForm" :model="taskForm" label-width="100px" size="mini" ref="taskForm" :rules="taskFormRules"> <el-form ref="taskForm" :form="taskForm" :model="taskForm" label-width="100px" size="mini" :rules="taskFormRules">
<el-form-item :label="$t('dataset.task_name')" prop="name"> <el-form-item :label="$t('dataset.task_name')" prop="name">
<el-input <el-input
v-model="taskForm.name" v-model="taskForm.name"
@ -189,7 +189,7 @@
</el-form> </el-form>
</el-col> </el-col>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeTask">{{ $t('dataset.cancel') }}</el-button> <el-button class="dialog_cancel_button" size="mini" @click="closeTask">{{ $t('dataset.cancel') }}</el-button>
<el-button type="primary" size="mini" @click="saveTask(taskForm)">{{ $t('dataset.confirm') }}</el-button> <el-button type="primary" size="mini" @click="saveTask(taskForm)">{{ $t('dataset.confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -432,7 +432,7 @@ export default {
created() { created() {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.listTaskLog(false) this.listTaskLog(false)
}, 5000); }, 5000)
this.taskTimer = setInterval(() => { this.taskTimer = setInterval(() => {
this.listTask(false) this.listTask(false)
}, 5000) }, 5000)
@ -577,7 +577,6 @@ export default {
} else { } else {
return false return false
} }
}) })
}, },
changeTaskStatus(task) { changeTaskStatus(task) {
@ -655,7 +654,7 @@ export default {
} }
}, },
listTaskLog(loading = true) { listTaskLog(loading = true) {
const params = {"conditions":[{"field":"dataset_table_task_log.table_id","operator":"eq","value": this.table.id}],"orders":[]} const params = { 'conditions': [{ 'field': 'dataset_table_task_log.table_id', 'operator': 'eq', 'value': this.table.id }], 'orders': [] }
post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => { post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
this.taskLogData = response.data.listObject this.taskLogData = response.data.listObject
this.page.total = response.data.itemCount this.page.total = response.data.itemCount
@ -754,6 +753,11 @@ export default {
overflow: hidden ; overflow: hidden ;
} }
.blackTheme .dialog_cancel_button {
background-color: #171b22 !important;
color: #2681ff !important;
}
.span{ .span{
font-size: 12px; font-size: 12px;
} }