代码生成优化 其他一些小优化

magic-boot-ui/src/components/magic/basic/mb-dialog.vue

@@ -14,7 +14,7 @@
     @close="$emit('close')"
   >
     <slot name="content" />
-    <template #footer>
+    <template v-if="showFooter" #footer>
       <div slot="footer" class="dialog-footer">
         <slot name="btns">
           <el-button @click="hide">
@@ -48,6 +48,10 @@ export default {
     destroyOnClose: {
       type: Boolean,
       default: true
+    },
+    showFooter: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

magic-boot-ui/src/components/magic/basic/mb-table-column.vue

@@ -31,7 +31,11 @@
           </el-button>
         </template>
       </div>
-      <el-image v-else-if="col.type === 'image'" :src="scope.row[col.field]" :preview-src-list="[scope.row[col.field]]" />
+      <el-image
+        v-else-if="col.type === 'image'"
+        :src="scope.row[col.field].startsWith('http') ? scope.row[col.field] : $global.baseApi + scope.row[col.field]"
+        :preview-src-list="[scope.row[col.field].startsWith('http') ? scope.row[col.field] : $global.baseApi + scope.row[col.field]]"
+      />
       <span v-else-if="col.type === 'html'" v-html="scope.row[col.field]"></span>
       <span v-else-if="col.click">
         <a style="color: blue" @click="col.click(scope.row)">{{ scope.row[col.field] }}</a>

magic-boot-ui/src/layout/layout.vue

@@ -6,14 +6,18 @@
       </div>
       <div class="header-right">
         <div class="avatar">
-          <el-avatar :size="40" fit="contain" :src="$global.baseApi + $global.user.info.headPortrait">
-            {{ !$global.user.info.headPortrait ? $global.user.info.name.substring(0,1) : '' }}
-          </el-avatar>
           <el-dropdown>
-            <span class="username">{{ $global.user.info.username }}</span>
-            <el-icon class="el-icon--right" color="white">
-              <arrow-down />
-            </el-icon>
+            <el-col>
+              <el-avatar :size="40" fit="contain" :src="$global.baseApi + $global.user.info.headPortrait">
+                {{ !$global.user.info.headPortrait ? $global.user.info.name.substring(0,1) : '' }}
+              </el-avatar>
+            </el-col>
+            <el-col style="line-height: 40px;">
+              <span class="username">{{ $global.user.info.username }}</span>
+              <el-icon class="el-icon--right" color="white">
+                <arrow-down />
+              </el-icon>
+            </el-col>
             <template #dropdown>
               <el-dropdown-menu>
                 <router-link to="/user-center">

magic-boot-ui/src/scripts/gen/gen-mb-list.js

@@ -43,18 +43,22 @@ function gen(groupPath, data){
     for(var i in data){
         var d = data[i]
         if(d.list){
+            var type = ''
+            if(d.component){
+                if(d.component.indexOf('upload-image') != -1){
+                    type = `,
+                    type: 'image'`
+                }
+            }
+            var dictType = ''
             if(d.dictType){
-                html += `
-                {
-                    dictType: '${d.dictType}',`
-            }else{
-                html += `
-                {
-                `
+                dictType = `,
+                    dictType: '${d.dictType}'`
             }
             html += `
+                {
                     field: '${d.columnName}',
-                    label: '${d.columnComment}'
+                    label: '${d.columnComment}'${type}${dictType}
                 },`
         }
     }
@@ -111,16 +115,25 @@ function gen(groupPath, data){
         if(d.save){
             var props = ''
             if(d.dictType){
-                props = `props: {
+                props = `,
+                    props: {
                         type: '${d.dictType}'
                     }`
             }
+            var rules = ''
+            if(d.required){
+                var messagePrefix = '请选择'
+                if(d.component.indexOf('input') != -1){
+                    messagePrefix = '请输入'
+                }
+                rules = `,
+                    rules: [{ required: true, message: '${messagePrefix}${d.columnComment}', trigger: 'change' }]`
+            }
             html += `{
                     span: 12,
                     name: '${d.columnName}',
                     label: '${d.columnComment}',
-                    ${d.component},
-                    ${props}
+                    ${d.component}${props}${rules}
                 },`
         }
     }

magic-boot-ui/src/views/system/dict/dict-list.vue

@@ -49,7 +49,7 @@
       </template>
     </mb-dialog>
 
-    <mb-dialog ref="dictItemsDialog" title="字典项" width="1400px">
+    <mb-dialog ref="dictItemsDialog" title="字典项" width="1400px" :show-footer="false">
       <template #content>
         <dict-items :key="Math.random()" v-model:dict-id="dictId" />
       </template>

magic-boot-ui/src/views/system/user/user-form.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="dataForm" :rules="rules" :model="temp" label-position="right" label-width="80px" v-if="isForm">
+  <el-form ref="dataForm" :rules="rules" :model="temp" label-position="right" label-width="90px" v-if="isForm">
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="登录名称" prop="username">