From 3e500eed7dc1c882fe999136f81119fc65b3bf01 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Tue, 7 Jan 2020 12:56:48 +0800
Subject: [PATCH] =?UTF-8?q?:ambulance:=202.4=20=E4=BC=98=E5=8C=96=E4=B8=8E?=
 =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D=201=E3=80=81=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=20loading=20=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#66=202=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=B8=B2=E6=9F=93=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20#65=203=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E6=97=B6=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=80=BC=E4=B8=8D=E5=A1=AB=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#64=204=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2=E6=97=B6?=
 =?UTF-8?q?=20header=20=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=20margin-left?=
 =?UTF-8?q?=20=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84=E9=94=99=E8=AF=AF=205?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=97=B6=E6=97=A5=E6=9C=9F=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=206=E3=80=81=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=8A=A0=E5=85=A5=20loading=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/eladmin.scss          | 7 +++++--
 src/components/Crud/UD.operation.vue    | 2 +-
 src/components/Crud/crud.js             | 4 ++++
 src/components/ThemePicker/index.vue    | 1 -
 src/views/mnt/app/index.vue             | 2 +-
 src/views/mnt/database/index.vue        | 2 +-
 src/views/mnt/deploy/index.vue          | 2 +-
 src/views/mnt/server/index.vue          | 2 +-
 src/views/monitor/server/index.vue      | 2 +-
 src/views/system/dept/index.vue         | 2 +-
 src/views/system/dict/dictDetail.vue    | 5 ++++-
 src/views/system/job/module/form.vue    | 2 +-
 src/views/system/menu/index.vue         | 4 ++--
 src/views/system/role/index.vue         | 3 +--
 src/views/system/timing/index.vue       | 2 +-
 src/views/system/user/index.vue         | 2 +-
 src/views/tools/storage/local/index.vue | 2 +-
 17 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index 338cbba..3ef9ac6 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -3,12 +3,15 @@
   .filter-item {
     display: inline-block;
     vertical-align: middle;
-    margin: 0 2px 10px 0;
+    margin: 0 3px 10px 0;
     input {
       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{
     line-height: 30.5px;
   }
@@ -17,7 +20,7 @@
     vertical-align: middle;
     margin-bottom: 10px;
     height: 30.5px;
-    width: 223px;
+    width: 223px !important;
   }
 }
 .el-avatar {
diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
index 38f3339..d99d2b1 100644
--- a/src/components/Crud/UD.operation.vue
+++ b/src/components/Crud/UD.operation.vue
@@ -1,6 +1,6 @@
 <template>
   <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">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index a07ce92..6eb8188 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -244,6 +244,7 @@ function CRUD(options) {
       if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
         return
       }
+      crud.status.add = CRUD.STATUS.PROCESSING
       crud.crudMethod.add(crud.form).then(() => {
         crud.status.add = CRUD.STATUS.NORMAL
         crud.resetForm()
@@ -251,6 +252,7 @@ function CRUD(options) {
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.toQuery()
       }).catch(() => {
+        crud.status.add = CRUD.STATUS.PREPARED
         callVmHook(crud, CRUD.HOOK.afterAddError)
       })
     },
@@ -261,6 +263,7 @@ function CRUD(options) {
       if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
         return
       }
+      crud.status.edit = CRUD.STATUS.PROCESSING
       crud.crudMethod.edit(crud.form).then(() => {
         crud.status.edit = CRUD.STATUS.NORMAL
         crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
@@ -269,6 +272,7 @@ function CRUD(options) {
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.refresh()
       }).catch(() => {
+        crud.status.edit = CRUD.STATUS.PREPARED
         callVmHook(crud, CRUD.HOOK.afterEditError)
       })
     },
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index ecc6d28..09a9254 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -35,7 +35,6 @@ 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',
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index fdb6277..62f59d5 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -58,7 +58,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index c5fb4dd..daa7400 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -52,7 +52,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 0f0762e..e50c3f4 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -89,7 +89,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--统还原组件-->
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index dab6dc5..f841810 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -42,7 +42,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 6e3c461..8a5dee3 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -27,7 +27,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ef48628..157d813 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -38,7 +38,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index 31e7d61..96b69c8 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -16,7 +16,7 @@
           <el-form-item label="字典标签" prop="label">
             <el-input v-model="form.label" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="字典值">
+          <el-form-item label="字典值" prop="value">
             <el-input v-model="form.value" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="排序" prop="sort">
@@ -84,6 +84,9 @@ export default {
         label: [
           { required: true, message: '请输入字典标签', trigger: 'blur' }
         ],
+        value: [
+          { required: true, message: '请输入字典值', trigger: 'blur' }
+        ],
         sort: [
           { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
         ]
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index ce4bbcc..d109b47 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -73,7 +73,7 @@
         取消
       </el-button>
       <el-button
-        :loading="crud.cu === 2"
+        :loading="crud.status.cu === 2"
         type="primary"
         @click="crud.submitCU"
       >
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3e2afe2..89527c4 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -89,7 +89,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
@@ -98,7 +98,7 @@
       <el-table-column v-if="columns.visible('name')" :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
       <el-table-column v-if="columns.visible('icon')" prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
+          <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
         </template>
       </el-table-column>
       <el-table-column v-if="columns.visible('sort')" prop="sort" align="center" label="排序">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7a83b80..ee45cd6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -51,7 +51,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <el-row :gutter="15">
@@ -165,7 +165,6 @@ export default {
     this.getMenus()
     crudRoles.getLevel().then(data => {
       this.level = data.level
-      console.log(this.level)
     })
     this.$nextTick(() => {
       this.crud.toQuery()
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index f812e66..a1f5be9 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -59,7 +59,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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>
     </el-dialog>
     <!--表格渲染-->
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1d0c471..a03ad6b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -138,7 +138,7 @@
           </el-form>
           <div slot="footer" class="dialog-footer">
             <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>
         </el-dialog>
         <!--表格渲染-->
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 0543225..53df178 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -58,7 +58,7 @@
       <div slot="footer" class="dialog-footer">
         <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-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>
     </el-dialog>
     <!--表格渲染-->