Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -251,11 +251,12 @@ public class TableServiceCmdService {
         // 处理外键
 //        handlerForeignKey(result, columns);
 
-        handler(result, columns);
+        handler(result =  filter(result, ObjectUtils::isNotEmpty), columns);
         // 定制接口
         result = isCustomized(dto.getTable(),result,"trigger_retrieve");
 
-        rows.put(FormDataConstant.PAGE_ROWS, result);
+        rows.put(PAGE_ROWS, result);
+        rows.put(TABLE_HEAD_LIST, getTableHeadList(genTable));
         return AjaxResult.success(rows);
     }
 
@@ -413,22 +414,28 @@ public class TableServiceCmdService {
         }
 
         List<JSONObject> result = Lists.newArrayListWithCapacity(jsonObject.size());
-        for (GenTableColumn column : columns) {
-            JSONObject map = new JSONObject();
-            for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
-                if (column.getColumnName().equalsIgnoreCase(entry.getKey())) {
-                    map.put(SINGLE_OBJ_NAME, column.getColumnName());
-                    map.put(SINGLE_OBJ_VALUE, entry.getValue());
-                    String htmlType = column.getHtmlType();
-                    map.put(SINGLE_OBJ_TYPE, htmlType);
-                    if (NEED_QUERY_DICT_LIST.contains(htmlType)) {
-                        map.put(SINGLE_OBJ_TYPES, remoteDictDataService.listByType(column.getDictType()));
-                    }
 
-                    result.add(map);
+            for (GenTableColumn column : columns) {
+                JSONObject map = new JSONObject();
+                for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
+                    if (column.getColumnName().equalsIgnoreCase(entry.getKey())) {
+                        map.put(SINGLE_OBJ_NAME, column.getColumnName());
+                        map.put(SINGLE_OBJ_VALUE, entry.getValue());
+                        String htmlType = column.getHtmlType();
+                        map.put(SINGLE_OBJ_TYPE, htmlType);
+                        if (NEED_QUERY_DICT_LIST.contains(htmlType)) {
+                            String dictType = column.getDictType();
+                            try {
+                                map.put(SINGLE_OBJ_TYPES, remoteDictDataService.listByType(dictType));
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        result.add(map);
+                    }
                 }
             }
-        }
 
         return result;
     }
@@ -482,8 +489,13 @@ public class TableServiceCmdService {
             if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
                 String dictType = column.getDictType();
                 if (ObjectUtils.isNotEmpty(dictType)) {
-                    List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
-                    column.setSysDictData(sysDictData1);
+                    try {
+                        List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
+                        column.setSysDictData(sysDictData1);
+                    } catch (Exception e) {
+                        System.out.println("sq_dictType = " + dictType);
+                        e.printStackTrace();
+                    }
                 }
 
                 queryList.add(column);
@@ -494,7 +506,7 @@ public class TableServiceCmdService {
         // genTable.getMenuRole() 暂时数据库没有数据，
         jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(genTable.getMenuRole()));
 
-        jsonObject.put(FormDataConstant.TABLE_HEAD_LIST, getTableHeadList(genTable));
+        // jsonObject.put(FormDataConstant.TABLE_HEAD_LIST, getTableHeadList(genTable));
         return AjaxResult.success(jsonObject);
     }
 

ruoyi-ui/src/api/tool/gen.js

@@ -192,3 +192,10 @@ export function getGenTableColumn(tableId) {
     method: 'get',
   })
 }
+// 获取字段信息
+export function getLoadTable() {
+  return request({
+    url: 'boman-gen/init/loadTable',
+    method: 'get',
+  })
+}

ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -54,7 +54,8 @@ export default {
   },
   data() {
     this.onlyOneChild = null
-    return {}
+    return {
+    }
   },
   mounted() {
   },

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -49,7 +49,6 @@ export default {
         },
         handleSide() {
           let add = []
-          console.log(this.sidebarRouters)
           for(let item of this.sidebarRouters){
             if(this.activeMenu.includes(item.path||item.redirect)){
               add.push(item)

ruoyi-ui/src/views/index.vue

@@ -237,7 +237,7 @@
     </el-row>
     <!-- <el-divider /> -->
   <!-- 添加或修改公告对话框 -->
-  <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
+  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
              <el-row>
                <el-col :span="24" >

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,19 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <img src="../assets/images/icon_dl_ewm@2x.png" v-if="statusFlag==1" @click="statusFlag=2" alt="" class="icon_rw">
+      <img src="../assets/images/icon_dl_madl@2x.png" v-if="statusFlag==2" alt="" @click="statusFlag=1" class="icon_mim">
       <h3 class="title"> 潜山市云数据中心</h3>
+      <div v-if="statusFlag==2">
+        <div class="erw_img">
+          <img src="" alt="" class="imgs">
+          <p>请使用手机扫描上方二维码登录</p>
+        </div>
+        <div class="mim_p">
+          密码登录
+        </div>
+      </div>
+      <div v-if="statusFlag==1">
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -33,11 +45,15 @@
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
+      <el-form-item style="width:100%; margin-bottom: 42px;">
          <div class="medTitle">
            快捷登录
          </div>
          <div class="med_icons">
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_wz@2x.png" alt="" class="icon">
+             <p>皖事通</p>
+           </div>
            <div class="med_icons_item" @click="btns">
              <img src="@/assets/images/icon_kjdl_dd@2x.png" alt="" class="icon">
              <p>钉钉</p>
@@ -61,7 +77,7 @@
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;background-color: #2865E1;"
+          style="width: 100%;background-color: #2865E1;height: 45px;"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -71,6 +87,7 @@
           * 使用快捷登录，请先绑定第三方账号
         </p>
       </el-form-item>
+      </div>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
@@ -88,6 +105,7 @@ export default {
   name: "Login",
   data() {
     return {
+      statusFlag: 1,
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
@@ -206,7 +224,11 @@ export default {
 }
 .med_icons{
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
+  width: 365px;
+  position: relative;
+  left: -23px;
+
   .med_icons_item{
     display: flex;
     flex-direction: column;
@@ -250,11 +272,48 @@ export default {
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
+  width: 441px;
   box-shadow: 0 0 25px #E3E3EA;
   margin-right: 101px;
   background-image: urk;
-  padding: 35px 25px 25px 25px;
+  padding: 58px 62px 49px;
+  position: relative;
+  .icon_rw{
+    position: absolute;
+    width: 72px;
+    height: 72px;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+  }
+  .icon_mim{
+    position: absolute;
+    width: 57px;
+    height: 57px;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+  }
+  .erw_img{
+    margin: 69px 0 83px;
+    text-align: center;
+    .img{
+      width: 240px;
+      height: 240px;
+      margin-bottom: 17px;
+    }
+    p{
+      color: #666666;
+      font-size: 14px;
+    }
+  }
+  .mim_p{
+    text-align: center;
+    color: #2865E1;
+    font-size: 15px;
+    font-weight: bold;
+    text-decoration: underline;
+  }
   .el-input {
     height: 38px;
     input {

ruoyi-ui/src/views/monitor/job/index.vue

@@ -138,7 +138,7 @@
     />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">

ruoyi-ui/src/views/system/config/index.vue

@@ -147,7 +147,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />

ruoyi-ui/src/views/system/dept/index.vue

@@ -84,7 +84,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">

ruoyi-ui/src/views/system/dict/data.vue

@@ -124,7 +124,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />

ruoyi-ui/src/views/system/dict/index.vue

@@ -158,7 +158,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />

ruoyi-ui/src/views/system/form/index.vue

@@ -18,7 +18,7 @@
           </el-form>
         </el-collapse-item>
         <!-- 列表 -->
-        <el-collapse-item :title="title" name="index"  class="eitde">
+        <el-collapse-item :title="title" name="index"  class="eitde" v-if="tabShoes">
           <div class="ppl">
             <p v-for="(item,index) in tabldie" :key="index" @click="enditTab(index)">
               <img src="../../../assets/images/icon_tbtab_normal.png" alt="" class="index_headerImg" v-if="numtab !== index">
@@ -35,26 +35,21 @@
             </el-form-item>
           </el-form> -->
           <el-divider></el-divider>
-          <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-            <el-table-column label="序号" align="center" prop="noticeId" width="80" />
-            <el-table-column :label="surlable" align="center" prop="name" />
-            <el-table-column :label="surlable" align="center" sortable prop="name" />
-            <el-table-column label="岗位编码" align="center" prop="postCode" />
-            <el-table-column label="岗位名称" align="center" prop="postName" />
-            <el-table-column label="岗位排序" align="center" prop="postSort" />
-            <el-table-column label="创建时间" align="center" prop="createTime" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="可用" align="center" class-name="small-padding fixed-width">
-
-            </el-table-column>
+          <el-table stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
+            <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index" />
           </el-table>
           <div class="index_haderPagin">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage3"
-              :page-size="queryParamslist.pageSize" layout="prev, pager, next, jumper" :total="1000">
-            </el-pagination>
+            <pagination
+              v-show="total>0"
+              :total="total"
+              :page.sync="queryParamslist.pageNo"
+              :limit.sync="queryParamslist.pageSize"
+              @pagination="foremliseju"
+            />
+           <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage3"
+              :page-size="queryParamslist.pageSize" layout="prev, pager, next, jumper" v-show="total>0"
+      :total="total" @pagination="foremliseju">
+            </el-pagination> -->
           </div>
         </el-collapse-item>
 
@@ -76,13 +71,15 @@
     data() {
       return {
         num: 0,
+       // 总条数
+        total: 0,
         loading:true,
         tabList: {},
         currentPage3: 0,
         activeNames: ['1'],
         title: '列表',
         objParams: {
-          table: 'sys_config',
+          table: 'obj_test',
           fixedData: {
             id: -1
           },
@@ -99,11 +96,11 @@
           pageNo: 1,
           pageSize: 10,
           orderBy:'create_time desc',
-          table: 'sys_config',
+          table: 'obj_test ',
         },
         labletit: '查询参数1233',
         surlable: '实际数据库表',
-        postList: [],
+        postList: {},
         numtab: 0,
         tabldie:[],
         tabShoes:false,//tab 显示隐藏
@@ -203,6 +200,9 @@
          console.log(res)
          let data = res.data
          this.postList = data
+         this.loading = false
+         this.total = res.data.total - 0
+         console.log(this.total)
          console.log(this.postList,567)
        })
       },

ruoyi-ui/src/views/system/menu/index.vue

@@ -88,7 +88,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">

ruoyi-ui/src/views/system/notice/index.vue

@@ -129,7 +129,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

ruoyi-ui/src/views/system/operlog/index.vue

@@ -142,7 +142,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">

ruoyi-ui/src/views/system/post/index.vue

@@ -122,7 +122,7 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />

ruoyi-ui/src/views/system/user/index.vue

@@ -204,7 +204,7 @@
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -310,7 +310,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"

ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper

ruoyi-ui/src/views/tool/build/IconsDialog.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="icon-dialog">
     <el-dialog
+	 :close-on-click-modal="false"
       v-bind="$attrs"
       width="980px"
       :modal-append-to-body="false"

ruoyi-ui/src/views/tool/gen/basicInfoForm.vue

@@ -7,8 +7,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="实际数据库表" prop="className">
-          <el-input v-model="info.className" placeholder="请输入实际数据库表" />
+        <el-form-item label="实际数据库表" prop="realTableName">
+          <el-input v-model="info.realTableName" placeholder="请输入实际数据库表" />
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -40,8 +40,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item  label="微改程序" prop="triggerUpdate">
-          <el-input v-model="info.triggerUpdate" placeholder="请输入微改程序" maxlength="50" />
+        <el-form-item  label="修改程序" prop="triggerUpdate">
+          <el-input v-model="info.triggerUpdate" placeholder="请输入修改程序" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -61,17 +61,17 @@
       </el-col>
       <el-col :span="12">
         <el-form-item   label="显示字段" prop="dkColumn">
-          <el-input  :disabled="true" v-model="info.dkColumn" placeholder="请输入显示字段" maxlength="50" />
+          <el-input  :disabled="true" :value="info.dkColumnName" placeholder="请输入显示字段" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item  label="输入字段" prop="akColumn">
-          <el-input :disabled="true" v-model="info.akColumn" placeholder="请输入输入字段" maxlength="50" />
+          <el-input :disabled="true" :value="info.akColumnName" placeholder="请输入输入字段" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item   label="主键" prop="tablePrimaryKey">
-          <el-input :disabled="true" v-model="info.tablePrimaryKey" placeholder="请输入主键" maxlength="50" />
+        <el-form-item   label="主键" prop="tablePrimaryKeyName">
+          <el-input :disabled="true" :value="info.tablePrimaryKeyName" placeholder="请输入主键" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -41,17 +41,17 @@
           <el-table-column label="排序" min-width="8%" align="center" prop="sort" />
           <el-table-column label="输入字段" min-width="10%">
             <template slot-scope="scope">
-              <el-checkbox true-label="Y" v-model="scope.row.isIn"></el-checkbox>
+              <el-checkbox true-label="Y" false-label="N" v-model="scope.row.isIn"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="显示字段" min-width="10%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isOut"></el-checkbox>
+              <el-checkbox true-label="Y" false-label="N" v-model="scope.row.isOut"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="查询" min-width="8%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="关联HR字段" min-width="10%" align="center" prop="hrParentId" >
@@ -71,7 +71,7 @@
             </el-table-column>
           <el-table-column label="必填" min-width="8%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="显示类型" min-width="12%">
@@ -86,6 +86,7 @@
                 <el-option label="图片上传" value="imageUpload" />
                 <el-option label="文件上传" value="fileUpload" />
                 <el-option label="富文本控件" value="editor" />
+                <el-option label="hr" value="hr" />
               </el-select>
             </template>
           </el-table-column>
@@ -101,7 +102,7 @@
           </el-table-column>
         </el-table>
         <!-- 添加或修改岗位对话框 -->
-        <el-dialog :title="title" :visible.sync="openZd" width="70vw" append-to-body>
+        <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openZd" width="70vw" append-to-body>
           <el-form ref="formZd" :model="formZd" :rules="rulesZd" label-width="120px">
             <el-row>
               <el-col :span="8">
@@ -128,38 +129,23 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="排序：" prop="sort">
-                  <el-input-number v-model="formZd.sort" placeholder="请输入排序" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="查询条件" prop="isQuery">
-                  <el-checkbox true-label="1" false-label="0" v-model="formZd.isQuery"></el-checkbox>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="显示字段" prop="isOut">
-                  <el-checkbox true-label="1" false-label="0" v-model="formZd.isOut"></el-checkbox>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="输入字段" prop="isIn">
-                  <el-checkbox true-label="Y" false-label="N" v-model="formZd.isIn"></el-checkbox>
+                  <el-input-number style="width: 100%;" v-model="formZd.sort" placeholder="请输入排序" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="外键(FK)：" prop="foreignKey">
-                  <el-select v-model="formZd.foreignKey" placeholder="请选择外键(FK)" clearable size="small">
+                  <el-select style="width: 100%;" v-model="formZd.foreignKey" placeholder="请选择外键(FK)" clearable size="small">
                     <el-option v-for="dict in columList" :key="dict.columnId" :label="dict.columnName" :value="dict.columnId" />
                   </el-select>
                 </el-form-item>
               </el-col>
+
             </el-row>
+
             <el-row>
               <el-col :span="8">
                 <el-form-item label="关联HR字段：" prop="hrParentId">
-                  <el-select v-model="formZd.hrParentId" placeholder="请选择关联HR字段" clearable>
+                  <el-select style="width: 100%;" v-model="formZd.hrParentId" placeholder="请选择关联HR字段" clearable>
                     <el-option v-for="dict in columList" :key="dict.columnId" :label="dict.columnName" :value="dict.columnId" />
                   </el-select>
                 </el-form-item>
@@ -171,14 +157,14 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="行数：" prop="numRows">
-                  <el-input-number v-model="formZd.numRows" placeholder="请输入行数" />
+                  <el-input-number style="width: 100%;" v-model="formZd.numRows" placeholder="请输入行数" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="列数：" prop="numColumns">
-                  <el-input-number v-model="formZd.numColumns" placeholder="请输入列数" />
+                  <el-input-number style="width: 100%;" v-model="formZd.numColumns" placeholder="请输入列数" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -195,7 +181,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="查询方式：" prop="queryType">
-                  <el-select v-model="formZd.queryType">
+                  <el-select style="width: 100%;" v-model="formZd.queryType">
                     <el-option label="=" value="EQ" />
                     <el-option label="!=" value="NE" />
                     <el-option label=">" value="GT" />
@@ -209,7 +195,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="显示类型：" prop="htmlType">
-                  <el-select v-model="formZd.htmlType">
+                  <el-select style="width: 100%;" v-model="formZd.htmlType">
                     <el-option label="文本框" value="input" />
                     <el-option label="文本域" value="textarea" />
                     <el-option label="下拉框" value="select" />
@@ -219,13 +205,14 @@
                     <el-option label="图片上传" value="imageUpload" />
                     <el-option label="文件上传" value="fileUpload" />
                     <el-option label="富文本控件" value="editor" />
+                    <el-option label="hr" value="hr" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="字典类型：" prop="dictType">
                   <template slot-scope="scope">
-                    <el-select v-model="formZd.dictType" clearable filterable placeholder="请选择">
+                    <el-select style="width: 100%;" v-model="formZd.dictType" clearable filterable placeholder="请选择">
                       <el-option v-for="dict in dictOptions" :key="dict.dictType" :label="dict.dictName" :value="dict.dictType">
                         <span style="float: left">{{ dict.dictName }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
@@ -235,10 +222,27 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="显示字段" prop="isOut">
+                  <el-checkbox true-label="Y" false-label="N" v-model="formZd.isOut"></el-checkbox>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="输入字段" prop="isIn">
+                  <el-checkbox true-label="Y" false-label="N" v-model="formZd.isIn"></el-checkbox>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="查询条件" prop="isQuery">
+                  <el-checkbox true-label="1" false-label="0" v-model="formZd.isQuery"></el-checkbox>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="必填" prop="isRequired">
-                  <el-checkbox true-label="Y" false-label="N" v-model="formZd.isRequired"></el-checkbox>
+                  <el-checkbox true-label="1" false-label="0" v-model="formZd.isRequired"></el-checkbox>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -308,19 +312,19 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="描述：" prop="postName">
           <el-input v-model="form.description" placeholder="请输入描述" />
         </el-form-item>
         <el-form-item label="关联表：" prop="relationParentId">
-          <el-select v-model="form.relationParentId" placeholder="请选择关联表" @change="relationFn" v-loadmore="loadMore">
+          <el-select style="width: 100%;" v-model="form.relationParentId" placeholder="请选择关联表" @change="relationFn" v-loadmore="loadMore">
             <el-option v-for="item in tableList.rows" :key="item.tableId" :label="item.tableComment" :value="item.tableId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="字段：" prop="relationChildId">
-          <el-select v-model="form.relationChildId" placeholder="请选择字段" v-loadmore="loadMore">
+          <el-select style="width: 100%;" v-model="form.relationChildId" placeholder="请选择字段" v-loadmore="loadMore">
             <el-option v-for="item in genList" :key="item.columnId" :label="item.columnName" :value="item.columnId">
             </el-option>
           </el-select>
@@ -329,17 +333,17 @@
           <el-input v-model="form.displayConditions" controls-position="right" placeholder="请输入显示条件" />
         </el-form-item>
         <el-form-item label="关联方式：" prop="relationType">
-          <el-select v-model="form.relationType" placeholder="请选择关联方式" clearable size="small">
+          <el-select style="width: 100%;" v-model="form.relationType" placeholder="请选择关联方式" clearable size="small">
             <el-option v-for="dict in relationType" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
           </el-select>
         </el-form-item>
         <el-form-item label="内嵌编辑：" prop="embedEdit">
-          <el-select v-model="form.embedEdit" placeholder="岗位状态" clearable size="small">
+          <el-select style="width: 100%;" v-model="form.embedEdit" placeholder="岗位状态" clearable size="small">
             <el-option v-for="dict in embedEdit" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
           </el-select>
         </el-form-item>
         <el-form-item label="序号：" prop="sort">
-          <el-input-number v-model="form.sort" controls-position="right" :min="0" />
+          <el-input-number style="width: 100%;" v-model="form.sort" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="是否可用：" prop="isDel">
           <el-checkbox true-label="Y" false-label="N" v-model="form.isDel"></el-checkbox>
@@ -461,6 +465,7 @@
         },
         // 关联表查询参数
         queryParams: {
+          relationParentId: this.$route.params && this.$route.params.tableId,
           pageNum: 1,
           pageSize: 10,
         },
@@ -586,8 +591,13 @@
             } else {
               addGenTableColumn(this.formZd).then(response => {
                 this.msgSuccess("新增成功");
-                this.open = false;
-                this.tabList();
+                this.openZd = false;
+                // 获取表详细信息
+                getGenTable(tableId).then(res => {
+                  this.cloumns = res.data.rows;
+                  this.info = res.data.info;
+                  this.tables = res.data.tables;
+                });
               });
             }
 
@@ -626,7 +636,7 @@
         const id = row.columnId
         getGenTableColumn(id).then(response => {
           let data = response.data
-          data.foreignKey = data.foreignKey-0
+          data.foreignKey = data.foreignKey?data.foreignKey-0:''
           this.formZd = data;
           this.openZd = true;
           this.title = "修改字段信息";

ruoyi-ui/src/views/tool/gen/importTable.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input

ruoyi-ui/src/views/tool/gen/index.vue

@@ -91,6 +91,17 @@
           v-hasPermi="['tool:gen:remove']"
         >删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-refresh"
+          size="mini"
+          style="background-color: #FDD6F3;color: #C790B9;border: 1px solid #C790B9;"
+          @click="handleCxbtn"
+          v-hasPermi="['tool:gen:remove']"
+        >重载缓存</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -106,31 +117,28 @@
         align="center"
         prop="tableName"
         :show-overflow-tooltip="true"
-        width="120"
       />
       <el-table-column
         label="表描述"
         align="center"
         prop="tableComment"
         :show-overflow-tooltip="true"
-        width="120"
       />
       <el-table-column
         label="实际数据库表"
         align="center"
         prop="className"
         :show-overflow-tooltip="true"
-        width="120"
       />
-      <el-table-column label="是否菜单" align="center" min-width="5%">
+      <el-table-column label="是否菜单" align="center">
         <template slot-scope="scope">
-          <el-checkbox true-label="1" v-model="scope.row.isMenu"></el-checkbox>
+          <el-checkbox true-label="Y" false-label="N" v-model="scope.row.isMenu"></el-checkbox>
         </template>
       </el-table-column>
-      <el-table-column label="菜单权限" align="center" prop="menuRole" width="160" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
+      <el-table-column label="菜单权限" align="center" prop="menuRole" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             type="text"
@@ -178,7 +186,7 @@
       @pagination="getList"
     />
     <!-- 新增弹框 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="65%" top="5vh" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="65%" top="5vh" append-to-body>
       <!-- <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
@@ -271,7 +279,7 @@
 </template>
 
 <script>
-import { listTable, previewTable, delTable, genCode, synchDb, addMenu } from "@/api/tool/gen";
+import { listTable, previewTable, delTable, genCode, synchDb, addMenu, getLoadTable } from "@/api/tool/gen";
 import importTable from "./importTable";
 import { downLoadZip } from "@/utils/zipdownload";
 import hljs from "highlight.js/lib/highlight";
@@ -349,6 +357,11 @@ export default {
     }
   },
   methods: {
+    handleCxbtn() {
+      getLoadTable().then(res => {
+        this.msgSuccess('重载缓存成功')
+      })
+    },
     /** 查询表集合 */
     getList() {
       this.loading = true;