Skip to content

F
front-backend
Commit c13ed624 by Elune
Options

Merge branch 'master' into 2.5dev

parents ab7c23f3 3e500eed
Showing with 27 additions and 19 deletions
src/assets/styles/eladmin.scss
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
.filter-item { .filter-item {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin: 0 2px 10px 0; margin: 0 3px 10px 0;
input { input {
height: 30.5px; height: 30.5px;
line-height: 30.5px; line-height: 30.5px;
} }
} }
.el-button+.el-button {
margin-left: 0 !important;
}
.el-select__caret.el-input__icon.el-icon-arrow-up{ .el-select__caret.el-input__icon.el-icon-arrow-up{
line-height: 30.5px; line-height: 30.5px;
} }
...@@ -17,7 +20,7 @@ ...@@ -17,7 +20,7 @@
vertical-align: middle; vertical-align: middle;
margin-bottom: 10px; margin-bottom: 10px;
height: 30.5px; height: 30.5px;
width: 223px; width: 223px !important;
} }
} }
.el-avatar { .el-avatar {
......
src/components/Crud/UD.operation.vue
<template> <template>
<div> <div>
<el-button v-permission="permission.edit" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" /> <el-button v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
<el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide"> <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
<p>{{ msg }}</p> <p>{{ msg }}</p>
<div style="text-align: right; margin: 0"> <div style="text-align: right; margin: 0">
......
src/components/Crud/crud.js
...@@ -244,6 +244,7 @@ function CRUD(options) { ...@@ -244,6 +244,7 @@ function CRUD(options) {
if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
return return
} }
crud.status.add = CRUD.STATUS.PROCESSING
crud.crudMethod.add(crud.form).then(() => { crud.crudMethod.add(crud.form).then(() => {
crud.status.add = CRUD.STATUS.NORMAL crud.status.add = CRUD.STATUS.NORMAL
crud.resetForm() crud.resetForm()
...@@ -251,6 +252,7 @@ function CRUD(options) { ...@@ -251,6 +252,7 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterSubmit) callVmHook(crud, CRUD.HOOK.afterSubmit)
crud.toQuery() crud.toQuery()
}).catch(() => { }).catch(() => {
crud.status.add = CRUD.STATUS.PREPARED
callVmHook(crud, CRUD.HOOK.afterAddError) callVmHook(crud, CRUD.HOOK.afterAddError)
}) })
}, },
...@@ -261,6 +263,7 @@ function CRUD(options) { ...@@ -261,6 +263,7 @@ function CRUD(options) {
if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
return return
} }
crud.status.edit = CRUD.STATUS.PROCESSING
crud.crudMethod.edit(crud.form).then(() => { crud.crudMethod.edit(crud.form).then(() => {
crud.status.edit = CRUD.STATUS.NORMAL crud.status.edit = CRUD.STATUS.NORMAL
crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
...@@ -269,6 +272,7 @@ function CRUD(options) { ...@@ -269,6 +272,7 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterSubmit) callVmHook(crud, CRUD.HOOK.afterSubmit)
crud.refresh() crud.refresh()
}).catch(() => { }).catch(() => {
crud.status.edit = CRUD.STATUS.PREPARED
callVmHook(crud, CRUD.HOOK.afterEditError) callVmHook(crud, CRUD.HOOK.afterEditError)
}) })
}, },
......
src/components/ThemePicker/index.vue
...@@ -35,7 +35,6 @@ export default { ...@@ -35,7 +35,6 @@ export default {
if (typeof val !== 'string') return if (typeof val !== 'string') return
const themeCluster = this.getThemeCluster(val.replace('#', '')) const themeCluster = this.getThemeCluster(val.replace('#', ''))
const originalCluster = this.getThemeCluster(oldVal.replace('#', '')) const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
console.log(themeCluster, originalCluster)
const $message = this.$message({ const $message = this.$message({
message: ' Compiling the theme', message: ' Compiling the theme',
......
src/views/mnt/app/index.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/mnt/database/index.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/mnt/deploy/index.vue
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--统还原组件--> <!--统还原组件-->
......
src/views/mnt/server/index.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/monitor/server/index.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/system/dept/index.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/system/dict/dictDetail.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-form-item label="字典标签" prop="label"> <el-form-item label="字典标签" prop="label">
<el-input v-model="form.label" style="width: 370px;" /> <el-input v-model="form.label" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="字典值"> <el-form-item label="字典值" prop="value">
<el-input v-model="form.value" style="width: 370px;" /> <el-input v-model="form.value" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
...@@ -84,6 +84,9 @@ export default { ...@@ -84,6 +84,9 @@ export default {
label: [ label: [
{ required: true, message: '请输入字典标签', trigger: 'blur' } { required: true, message: '请输入字典标签', trigger: 'blur' }
], ],
value: [
{ required: true, message: '请输入字典值', trigger: 'blur' }
],
sort: [ sort: [
{ required: true, message: '请输入序号', trigger: 'blur', type: 'number' } { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
] ]
......
src/views/system/job/module/form.vue
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
取消 取消
</el-button> </el-button>
<el-button <el-button
:loading="crud.cu === 2" :loading="crud.status.cu === 2"
type="primary" type="primary"
@click="crud.submitCU" @click="crud.submitCU"
> >
......
src/views/system/menu/index.vue
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" /> <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
<el-table-column prop="icon" label="图标" align="center" width="60px"> <el-table-column prop="icon" label="图标" align="center" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon :icon-class="scope.row.icon" /> <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sort" align="center" label="排序"> <el-table-column prop="sort" align="center" label="排序">
......
src/views/system/role/index.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-row :gutter="15"> <el-row :gutter="15">
...@@ -165,7 +165,6 @@ export default { ...@@ -165,7 +165,6 @@ export default {
this.getMenus() this.getMenus()
crudRoles.getLevel().then(data => { crudRoles.getLevel().then(data => {
this.level = data.level this.level = data.level
console.log(this.level)
}) })
this.$nextTick(() => { this.$nextTick(() => {
this.crud.toQuery() this.crud.toQuery()
......
src/views/system/timing/index.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/system/user/index.vue
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
src/views/tools/storage/local/index.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button> <el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">确认</el-button> <el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">确认</el-button>
<el-button v-else :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> <el-button v-else :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment