Merge branch 'gin-vue-admin_v2_dev' of...

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev

web/src/view/superAdmin/menu/icon.vue

@@ -317,17 +317,17 @@
           }
         },
         props:{
-            getIcon:{
+            icon:{
                     default: function() {
                         return {}
                     },
-                    type: Function
-            }
+                    type: Object
+            },
+        },
+        created() {
+            this.value = this.icon.icon
         },
         methods:{
-            propIcon(icon){
-                this.getIcon(icon)
-            }
         }
     }
 </script>

web/src/view/superAdmin/menu/menu.vue

@@ -71,7 +71,7 @@
           <el-input autocomplete="off" v-model="form.meta.title"></el-input>
         </el-form-item>
         <el-form-item label="图标" prop="meta.icon" style="width:30%">
-          <icon :getIcon="getIcon">
+          <icon :icon="icon">
             <template slot="prepend" >el-icon-</template>
           </icon>
         </el-form-item>
@@ -143,19 +143,14 @@ export default {
           { required: true, message: "请输入菜单展示名称", trigger: "blur" }
         ]
       },
-      isEdit: false
+      isEdit: false,
+      test:''
     };
   },
   components:{
     icon
   },
-  props:[
-      'getIcon'
-  ],
   methods: {
-    getIcon(icon){
-      this.form.meta.icon = icon
-    },
     setOptions() {
       this.menuOption = [
         {
@@ -295,6 +290,7 @@ export default {
       this.dialogTitle = "编辑菜单";
       const res = await getBaseMenuById({ id });
       this.form = res.data.menu;
+      this.icon = this.form.meta;
       this.isEdit = true;
       this.setOptions();
       this.dialogFormVisible = true;