Merge remote-tracking branch 'origin/master'

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableColumnService.java

@@ -0,0 +1,33 @@
+package com.boman.gen.api;
+
+import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.gen.domain.GenTableColumn;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 生成代码模块，远程调用入口，如需其他接口，在此添加
+ *
+ * @author shiqian
+ * @date 2021年04月06日 14:22
+ **/
+@FeignClient(contextId = "remoteGenTableColumnService", value = ServiceNameConstants.GEN_SERVICE)
+public interface RemoteGenTableColumnService {
+
+
+    /**
+     * 功能描述: 通过表名查找表对应的所有的列
+     *
+     * @param tableId tableId
+     * @return GenTable
+     */
+    @GetMapping(value = "/genTableColumn/{tableId}")
+    AjaxResult listColumnsByTableId(@PathVariable("tableId") Long tableId);
+
+    @GetMapping(value = "/pk/{columnId}")
+    GenTableColumn getById(@PathVariable("columnId") Long columnId);
+
+
+}

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableService.java

@@ -1,13 +1,10 @@
 package com.boman.gen.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.TableSql;
 import com.boman.gen.domain.GenTable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * 生成代码模块，远程调用入口，如需其他接口，在此添加
@@ -18,6 +15,15 @@ import org.springframework.web.bind.annotation.PostMapping;
 @FeignClient(contextId = "remoteGenTableService", value = ServiceNameConstants.GEN_SERVICE)
 public interface RemoteGenTableService {
 
+    /**
+     * 功能描述: 通过表名查找表对应的所有的列
+     *
+     * @param tableId tableId
+     * @return GenTable
+     */
+    @GetMapping(value = "/gen/tableId/{tableId}")
+    GenTable getByTableId(@PathVariable("tableId") Long tableId);
+
 
     /**
      * 功能描述: 通过表名查找表信息

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/obj/ObjectUtils.java

@@ -121,6 +121,10 @@ public class ObjectUtils {
         return input != null && !input.isEmpty();
     }
 
+    public static boolean isEmpty(JSONArray input){
+        return !isNotEmpty(input);
+    }
+
     /**
      * 功能描述: 暂且只做 string collection long 三种类型的校验
      *

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -106,6 +106,17 @@ public class GenController extends BaseController {
         return genTableService.selectGenTableByName(tableName);
     }
 
+    /**
+     * 功能描述: 根据表id查询表信息
+     *
+     * @param tableId tableId
+     * @return GenTable
+     */
+    @GetMapping(value = "/tableId/{tableId}")
+    public GenTable getByTableName(@PathVariable Long tableId) {
+        return genTableService.getByTableId(tableId);
+    }
+
     /**
      * 导入表结构（保存）
      */

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -79,4 +79,12 @@ public class GenTableColumnController extends BaseController {
         return AjaxResult.success(genTableColumnService.selectGenTableColumnListByTableId(tableId));
     }
 
+    /**
+     * 根据主键查找
+     */
+    @GetMapping(value = "/pk/{columnId}")
+    public GenTableColumn getById(@PathVariable Long columnId) {
+        return genTableColumnService.selectGenTableColumnListByColumnId(columnId);
+    }
+
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java

@@ -119,6 +119,7 @@ public class MyController extends BaseController {
             List<GenTableColumn> columnList = new ArrayList<>(16);
             for (GenTableColumn tableColumn : genTableColumns) {
                 if (table.getTableId().equals(tableColumn.getTableId())) {
+                    tableColumn.setTableName(table.getTableName());
                     columnList.add(tableColumn);
                 }
             }

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java

@@ -29,6 +29,9 @@ public class GenTableColumn extends BaseEntity
     /** 归属表编号 */
     private Long tableId;
 
+    /** 归属表名 数据库没有此字段*/
+    private String tableName;
+
     /** 列名称 */
     private String columnName;
 
@@ -529,4 +532,12 @@ public class GenTableColumn extends BaseEntity
     public void setHrChildren(List<GenTableColumn> hrChildren) {
         this.hrChildren = hrChildren;
     }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -77,6 +77,11 @@ public class GenTableServiceImpl implements IGenTableService {
         return genTable;
     }
 
+    @Override
+    public GenTable getByTableId(Long id) {
+        return genTableMapper.selectGenTableById(id);
+    }
+
     /**
      * 查询业务列表
      *

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableService.java

@@ -59,6 +59,14 @@ public interface IGenTableService {
      */
     public GenTable selectGenTableById(Long id);
 
+    /**
+     * 查询业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable getByTableId(Long id);
+
     /**
      * 修改业务
      *

boman-web-core/src/main/java/com/boman/web/core/constant/MaskConstant.java

@@ -19,6 +19,9 @@ public class MaskConstant {
     /**  修改可见  **/
     public static final String UPDATE_VISIBLE = "1";
 
+    /**  列表可见  **/
+    public static final String LIST_VISIBLE = "1";
+
     /**  列表可修改  **/
     public static final String LIST_CAN_EDIT = "1";
 }

boman-web-core/src/main/java/com/boman/web/core/controller/TableController.java

@@ -1,6 +1,7 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.gen.domain.GenTable;
 import com.boman.web.core.domain.BaseTableSaveDTO;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
@@ -39,5 +40,20 @@ public class TableController {
         return tableServiceCmdService.getByTableName(condition);
     }
 
+    /**
+     * 功能描述: 根据表名获取表信息、表字段和表字段对应的字典值
+     *                          {
+     *                              "tableId": 1
+     *                          }
+     *
+     * @param table table
+     * @return com.boman.common.core.web.domain.AjaxResult
+     */
+    @ApiOperation(value = "根据表名获取表单所有信息, 没有过滤")
+    @PostMapping("/listAllColumnsByTableId")
+    public AjaxResult listAllColumnsByTableId(@RequestBody GenTable table) {
+        return tableServiceCmdService.listAllColumnsByTableId(table);
+    }
+
 
 }

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -508,16 +508,13 @@ public interface StandardlyMapper {
             wholeSql.append("select ");
             // showData
             StringBuilder showDataSql = new StringBuilder();
-            if (ObjectUtils.isNotEmpty(showData)) {
-                for (Object columnObj : showData) {
-                    String columnName = (String) columnObj;
-                    showDataSql.append(columnName).append(", ");
-                }
-                wholeSql.append(StringUtils.substringBeforeLast(showDataSql.toString(), ","));
-            } else {
-                showDataSql.append(" * ");
+            // 调用之前进行了判空，showData肯定不为空
+            for (Object columnObj : showData) {
+                String columnName = (String) columnObj;
+                showDataSql.append(columnName).append(", ");
             }
-
+            wholeSql.append(StringUtils.substringBeforeLast(showDataSql.toString(), ","));
+//
             wholeSql.append(showDataSql).append(" from ").append(tableName);
             // 条件
             packCondition(packCondition, wholeSql);

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

@@ -11,6 +11,7 @@ import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.SysDictData;
+import com.boman.gen.api.RemoteGenTableColumnService;
 import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.controller.MyController;
 import com.boman.gen.domain.GenTable;
@@ -18,6 +19,7 @@ import com.boman.gen.domain.GenTableColumn;
 import com.boman.gen.domain.GenTableRelation;
 import com.boman.system.api.RemoteDictDataService;
 import com.boman.web.core.constant.FormDataConstant;
+import com.boman.web.core.constant.MaskConstant;
 import com.boman.web.core.constant.SubmitConstant;
 import com.boman.web.core.domain.*;
 import com.boman.web.core.service.delete.IBaseDeleteService;
@@ -25,6 +27,7 @@ import com.boman.web.core.service.save.IBaseSaveService;
 import com.boman.web.core.service.select.IBaseSelectService;
 import com.boman.web.core.service.submit.IBaseSubmitService;
 import com.boman.web.core.service.update.IBaseUpdateService;
+import com.boman.web.core.utils.ColumnUtils;
 import com.boman.web.core.utils.IdUtils;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
@@ -44,6 +47,7 @@ import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.web.core.constant.FormDataConstant.*;
+import static com.boman.web.core.utils.ColumnUtils.*;
 
 /**
  * @author shiqian
@@ -71,6 +75,8 @@ public class TableServiceCmdService {
     private RemoteDictDataService remoteDictDataService;
     @Resource
     private RemoteGenTableService remoteGenTableService;
+    @Resource
+    private RemoteGenTableColumnService remoteGenTableColumnService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TableServiceCmdService.class);
 
@@ -225,8 +231,9 @@ public class TableServiceCmdService {
         List<GenTableColumn> columns = genTable.getColumns();
         // 封装好以后的查询条件
         JSONObject packCondition = ifNullSetEmpty(packColCondition(columns, condition));
-        // 需要返回到前台的列
-        JSONArray showData = ifNullSetEmpty(fixedData.getJSONArray(SHOW_DATA));
+        // 需要返回到前台的列, 需要判断是否是列表展示, 4为判断列表是否可见
+        JSONArray showData = filterData(columns, 4, fixedData.getJSONArray(SHOW_DATA), MaskConstant.LIST_VISIBLE::equals);
+
         JSONObject rows = new JSONObject();
         int total = selectService.countByCondition(genTable.getTableName(), condition, packCondition);
         rows.put(FormDataConstant.PAGE_TOTAL, total);
@@ -237,13 +244,52 @@ public class TableServiceCmdService {
 
         List<JSONObject> result = selectService.selectByCondition(genTable.getTableName(), condition, packCondition
                 , showData, dto.getOrderBy(), dto.getLimit(), dto.getOffset());
+        // 处理时间
         handlerDate(result, columns);
+        // 处理字典值
         handlerSysDictData(result, columns);
+        // 处理外键
+        handlerForeignKey(result, columns);
+        // 定制接口
         result = isCustomized(dto.getTable(),result,"trigger_retrieve");
+
         rows.put(FormDataConstant.PAGE_ROWS, result);
         return AjaxResult.success(rows);
     }
 
+    private void handlerForeignKey(List<JSONObject> result, List<GenTableColumn> columns) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(result)) {
+            return;
+        }
+
+        // 拿到所有有fk的列
+        columns = filter(columns, col -> ObjectUtils.isNotEmpty(col.getForeignKey()));
+        for (GenTableColumn column : columns) {
+            JSONObject jsonObject = new JSONObject();
+//            Long selfTableId = column.getTableId();
+            String selfColumnName = column.getColumnName();
+            for (JSONObject json : result) {
+                if (json.containsKey(selfColumnName)) {
+                    Object value = json.get(selfColumnName);
+
+                    Long fkColumnId = Long.parseLong(column.getForeignKey());
+                    GenTableColumn fkTableColumn = remoteGenTableColumnService.getById(fkColumnId);
+                    Long fkTableId = fkTableColumn.getTableId();
+                    GenTable fkGenTable = remoteGenTableService.getByTableId(fkTableId);
+                    String fkTableName= fkGenTable.getTableName();
+
+                    // select * from fkTableName where fkTableColumn.columnName = value;
+
+//                    jsonObject.put(columnName, "");
+//                    jsonObject.put("columnName", "");
+
+                }
+            }
+
+
+        }
+    }
+
     /**
      * 功能描述: 把timeStamp转为string
      *
@@ -360,7 +406,7 @@ public class TableServiceCmdService {
 
     /**
      * 功能描述: 封装成查询条件 key: 列名，  value：查询条件_查询类别
-     * eg: [{"config_name":"系统配置_like"}, {"config_name":"_like"}]
+     * eg: [{"config_name": ["系统配置", "EQ", "varchar(100)"]}]
      *
      * @param columns columns
      * @return com.alibaba.fastjson.JSONObject
@@ -497,9 +543,7 @@ public class TableServiceCmdService {
     public List<GenTableColumn> getTableHeadList(GenTable genTable){
         List<GenTableColumn> columns = genTable.getColumns();
         // 表头
-        return columns.stream()
-                .filter(genTableColumn -> GenTableColumn.IS_LIST.equals(genTableColumn.getIsList()))
-                .collect(Collectors.toList());
+        return filterData(columns, 4, MaskConstant.LIST_VISIBLE::equals);
     }
 
     /**
@@ -742,5 +786,8 @@ public class TableServiceCmdService {
     }
 
 
+    public AjaxResult listAllColumnsByTableId(GenTable table) {
+        return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
+    }
 }
 

boman-web-core/src/main/java/com/boman/web/core/service/select/BaseSelectServiceImpl.java

@@ -41,7 +41,7 @@ public class BaseSelectServiceImpl implements IBaseSelectService {
     public List<JSONObject> selectByCondition(String tableName, JSONObject condition
             , JSONObject packCondition, JSONArray showData, String orderBy, Integer limit, Integer offset) {
         requireNonNull(tableName, "表名为空");
-//        requireNonNull(showData);
+        requireNonNull(showData, "数据库中此表: [" + tableName + "] , 没有列表展示的字段");
         requireNonNull(orderBy);
         return mapper.selectByCondition(tableName, condition, packCondition, showData, orderBy, limit, offset);
     }

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -1,5 +1,6 @@
 package com.boman.web.core.utils;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.gen.domain.GenTableColumn;
 import com.boman.web.core.constant.FormDataConstant;
@@ -9,7 +10,9 @@ import java.sql.Timestamp;
 import java.util.List;
 import java.util.function.Predicate;
 
+import static com.boman.common.core.utils.obj.ObjectUtils.isEmpty;
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
+import static com.boman.web.core.constant.FormDataConstant.HR;
 
 /**
  * @author shiqian
@@ -46,33 +49,79 @@ public class ColumnUtils {
      * 功能描述: 把新增可见或者修改可见或者.....的列过滤出来
      *
      * @param allColumns 所有的列
-     * @param sort 那六个1的顺序
-     *             sort=0  =>  新增可见
-     *             sort=1  =>  新增可修改
-     *             sort=2  =>  修改可见
-     *             sort=3  =>  修改可修改
-     *             sort=4  =>  列表可见
-     *             sort=5  =>  列表可修改
+     * @param sort       那六个1的顺序 [1,1,1,1,1,1]
+     *                   sort=0  =>  新增可见
+     *                   sort=1  =>  新增可修改
+     *                   sort=2  =>  修改可见
+     *                   sort=3  =>  修改可修改
+     *                   sort=4  =>  列表可见
+     *                   sort=5  =>  列表可修改
      * @return List<GenTableColumn>
      */
     public static List<GenTableColumn> filterData(List<GenTableColumn> allColumns, int sort, Predicate<String> predicate) {
         assert sort < 6;
         List<GenTableColumn> returnData = Lists.newArrayListWithCapacity(16);
         for (GenTableColumn allColumn : allColumns) {
-            String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
-            assert maskArray.length == 6;
-            // 新增可见
-            String insertVisible = maskArray[sort];
-            if (predicate.test(insertVisible)) {
-                returnData.add(allColumn);
+            if (!HR.equalsIgnoreCase(allColumn.getHtmlType())) {
+                String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
+                assert maskArray.length == 6;
+                // sort
+                String insertVisible = maskArray[sort];
+                if (predicate.test(insertVisible)) {
+                    returnData.add(allColumn);
+                }
+            }
+
+        }
+
+        return returnData;
+    }
+
+    /**
+     * 功能描述: 按照predicate的规则过滤allColumns中包含data并且符合过滤规则的数据
+     *
+     * @param allColumns 所有的列
+     * @param sort       同{@link ColumnUtils#filterData(java.util.List, int, java.util.function.Predicate)}
+     * @param data       从其中过滤符合规则的数据，data中字符串全部是大写的
+     * @param predicate  predicate
+     * @return JSONArray
+     */
+    public static JSONArray filterData(List<GenTableColumn> allColumns, int sort, JSONArray data, Predicate<String> predicate) {
+        assert sort < 6;
+        JSONArray returnData = new JSONArray(data.size());
+        boolean dataIsEmpty = isEmpty(data);
+        if (dataIsEmpty) {
+            // data为空，拿出所有列中列表可见的
+            for (GenTableColumn allColumn : allColumns) {
+                String columnName = allColumn.getColumnName().toUpperCase();
+                String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
+                assert maskArray.length == 6;
+                String maskValue = maskArray[sort];
+                if (predicate.test(maskValue)) {
+                    returnData.add(columnName);
+                }
+            }
+        } else {
+            // data不为空，拿出前端传过来的列中可见的
+            for (GenTableColumn allColumn : allColumns) {
+                String columnName = allColumn.getColumnName().toUpperCase();
+                if (data.contains(columnName)) {
+                    String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
+                    assert maskArray.length == 6;
+                    String maskValue = maskArray[sort];
+                    if (predicate.test(maskValue)) {
+                        returnData.add(columnName);
+                    }
+                }
             }
         }
 
+
         return returnData;
     }
 
-    public static String parseVariables(String variables){
-         return variables.replaceAll("\\$", "");
+    public static String parseVariables(String variables) {
+        return variables.replaceAll("\\$", "");
     }
 
 }

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

@@ -1,5 +1,44 @@
 import request from '@/utils/request'
 
+// 新增关联表
+export function addGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'post',
+    data
+  })
+}
+// 修改关联表
+export function setGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'put',
+    data
+  })
+}
+// 删除关联表
+export function delGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'delete',
+  })
+}
+// 查看关联表
+export function qurGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'get',
+  })
+}
+
+// 关联表列表
+export function tabList(query) {
+  return request({
+    url: '/boman-gen/genTableRelation/list',
+    method: 'get',
+    params: query
+  })
+}
 // 查询生成表数据
 export function listTable(query) {
   return request({
@@ -34,6 +73,15 @@ export function getGenTable(tableId) {
   })
 }
 
+// 查询表详细信息
+export function listAllColumnsByTableId(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/listAllColumnsByTableId',
+    method: 'post',
+    data
+  })
+}
+
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
@@ -90,3 +138,27 @@ export function synchDb(tableName) {
     method: 'get'
   })
 }
+
+// 查询数据库sql
+export function tableSql(id) {
+  return request({
+    url: '/boman-gen/tableSql/'+id,
+    method: 'get',
+  })
+}
+// 执行创建语句
+export function zxImplement(data) {
+  return request({
+    url: '/boman-gen/tableSql/implement',
+    method: 'post',
+    data
+  })
+}
+// 刷新创建语句
+export function getReload(data) {
+  return request({
+    url: '/boman-gen/tableSql/reload',
+    method: 'POST',
+    data
+  })
+}

ruoyi-ui/src/components/Directives/index.js

@@ -0,0 +1,14 @@
+import Vue from 'vue'
+Vue.directive('loadmore', {
+ bind (el, binding) {
+  // 获取element-ui定义好的scroll盒子
+  const SELECTWRAP_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap')
+  SELECTWRAP_DOM.addEventListener('scroll', function () {
+    
+   const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight
+   if (CONDITION) {
+    binding.value()
+   }
+  })
+ }
+})

ruoyi-ui/src/main.js

@@ -48,6 +48,9 @@ Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
 }
 
+import directive from "@/components/Directives";
+Vue.use(directive)
+
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)

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

@@ -1,6 +1,6 @@
 <template>
   <el-card>
-    <el-row type="flex"  justify="space-between" style="margin: 10px 0;">
+    <el-row type="flex" v-if="activeName=='cloum'" justify="space-between" style="margin: 10px 0;">
       <el-col :span="1.5" style="display: flex; align-items: center;">
         <el-form label-width="100px" style="display: flex; align-items: center;">
           <el-form-item style="text-align: center;margin-left:-100px;margin-top:0; margin-bottom: 0;">
@@ -9,27 +9,13 @@
           </el-form-item>
         </el-form>
       </el-col>
-      <el-row type="flex" :gutter="10"  justify="end">
+      <el-row type="flex" :gutter="10" justify="end">
         <el-col :span="1.5" style="display: flex; align-items: center;">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:post:add']"
-          >新增</el-button>
+          <el-button type="warning" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:post:add']">新增</el-button>
         </el-col>
         <el-col :span="1.5" style="display: flex; align-items: center;">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:post:remove']"
-          >删除</el-button>
+          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['system:post:remove']">删除</el-button>
         </el-col>
         <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
       </el-row>
@@ -43,25 +29,15 @@
         <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
-          <el-table-column
-            label="字段列名"
-            prop="columnName"
-            min-width="10%"
-            :show-overflow-tooltip="true"
-          />
+          <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" />
           <el-table-column label="字段描述" min-width="10%">
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="物理类型"
-            prop="columnType"
-            min-width="10%"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column label="字段显示规则" align="center" prop="mask" min-width="11%"/>
-          <el-table-column label="排序" min-width="8%" align="center" prop="sort"/>
+          <el-table-column label="物理类型" prop="columnType" min-width="10%" :show-overflow-tooltip="true" />
+          <el-table-column label="字段显示规则" align="center" prop="mask" min-width="11%" />
+          <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="1" v-model="scope.row.isIn"></el-checkbox>
@@ -77,9 +53,9 @@
               <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="关联HR字段" min-width="10%" align="center" prop="hrParentId"/>
-          <el-table-column label="缺省值" min-width="10%" align="center" prop="defaultValue"/>
-          <el-table-column label="外键" min-width="10%" align="center" prop="foreignKey"/>
+          <el-table-column label="关联HR字段" min-width="10%" align="center" prop="hrParentId" />
+          <el-table-column label="缺省值" min-width="10%" align="center" prop="defaultValue" />
+          <el-table-column label="外键" min-width="10%" align="center" prop="foreignKey" />
           <el-table-column label="必填" min-width="8%">
             <template slot-scope="scope">
               <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
@@ -103,237 +79,669 @@
           <el-table-column label="字典类型" min-width="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
-                <el-option
-                  v-for="dict in dictOptions"
-                  :key="dict.dictType"
-                  :label="dict.dictName"
-                  :value="dict.dictType">
+                <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>
-              </el-option>
+                </el-option>
               </el-select>
             </template>
           </el-table-column>
         </el-table>
+        <!-- 添加或修改岗位对话框 -->
+        <el-dialog :title="title" :visible.sync="openZd" width="70vw" append-to-body>
+          <el-form ref="formZd" :model="formZd" :rules="rules" label-width="120px">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="字段名：" prop="columnName">
+                  <el-input v-model="formZd.columnName" placeholder="请输入字段名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="字段描述：" prop="columnComment">
+                  <el-input v-model="formZd.columnComment" placeholder="请输入字段描述" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="物理类型：" prop="columnType">
+                  <el-input v-model="formZd.columnType" placeholder="请输入物理类型" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="字段显示规则：" prop="mask">
+                  <el-input v-model="formZd.mask" placeholder="请输入字段显示规则" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="排序：" prop="sort">
+                  <el-input v-model="formZd.sort" placeholder="请输入排序" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="查询条件" prop="isQuery">
+                  <el-checkbox true-label="Y" false-label="N" 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="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="外键(FK)：" prop="foreignKey">
+                  <el-select 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-option v-for="dict in columList" :key="dict.columnId" :label="dict.columnName" :value="dict.columnId" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="缺省值：" prop="defaultValue">
+                  <el-input v-model="formZd.defaultValue" placeholder="请输入缺省值" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="行数：" prop="numRows">
+                  <el-input-number 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-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="字段翻译器：" prop="fieldTranslator">
+                  <el-input v-model="formZd.fieldTranslator" placeholder="请输入字段翻译器" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="扩展属性：" prop="extendedAttributes">
+                  <el-input v-model="formZd.extendedAttributes" placeholder="请输入扩展属性" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="查询方式：" prop="queryType">
+                  <el-select v-model="formZd.queryType">
+                    <el-option label="=" value="EQ" />
+                    <el-option label="!=" value="NE" />
+                    <el-option label=">" value="GT" />
+                    <el-option label=">=" value="GTE" />
+                    <el-option label="<" value="LT" />
+                    <el-option label="<=" value="LTE" />
+                    <el-option label="LIKE" value="LIKE" />
+                    <el-option label="BETWEEN" value="BETWEEN" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="显示类型：" prop="htmlType">
+                  <el-select v-model="formZd.htmlType">
+                    <el-option label="文本框" value="input" />
+                    <el-option label="文本域" value="textarea" />
+                    <el-option label="下拉框" value="select" />
+                    <el-option label="单选框" value="radio" />
+                    <el-option label="复选框" value="checkbox" />
+                    <el-option label="日期控件" value="datetime" />
+                    <el-option label="图片上传" value="imageUpload" />
+                    <el-option label="文件上传" value="fileUpload" />
+                    <el-option label="富文本控件" value="editor" />
+                  </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-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>
+                      </el-option>
+                    </el-select>
+                  </template>
+                </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-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFormZd">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
       </el-tab-pane>
-     <!-- <el-tab-pane label="生成信息" name="genInfo">
+      <!-- <el-tab-pane label="生成信息" name="genInfo">
         <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
       </el-tab-pane> -->
       <el-tab-pane label="关联表" name="genInfo">
-        <el-row style="margin-bottom: 20px;">
-          <el-col :span="12">
-            <el-button style="background-color: #1591FF;color: #fff;border: 1px solid #1591FF;">保存</el-button>
-            <el-button style="background-color: #fff;color: #5B636C;border: 1px solid #ECECEC;">返回</el-button>
+        <el-row style="margin-bottom: 20px;" type="flex" :gutter="10" justify="end">
+          <el-col :span="1.5">
+            <el-button @click="handleAdd_gl" icon="el-icon-plus" size="mini" style="background-color: #FFE9ED;color: #E58481;border: 1px solid #E58481;">新增</el-button>
           </el-col>
-          <el-col :span="12" style="text-align: right;">
-            <el-button style="background-color: #FFE9ED;color: #E58481;border: 1px solid #E58481;">新增</el-button>
-            <el-button style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;">删除</el-button>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-delete" @click="handleDel_gl" size="mini" style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;"
+              :disabled="multiple1">删除</el-button>
           </el-col>
         </el-row>
-         <el-table  :data="cloumns" row-key="columnId" :max-height="tableHeight">
-           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="可用" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="描述" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="关联表" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="字段（关联到主表PK）" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="显示条件" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="关联方式" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="内嵌编辑" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="修改人" type="index" min-width="5%" class-name="allowDrag" />
-           <el-table-column label="修改时间" type="index" min-width="5%" class-name="allowDrag" />
-         </el-table>
-       </el-tab-pane>
-       <el-tab-pane label="数据库SQL" name="genSql">
-          <el-row>
-            <el-button style="background-color: #FFE9ED;color: #E58481;border: 1px solid #E58481;">执行创建语句</el-button>
-            <el-button style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;">刷新创建语句</el-button>
-          </el-row>
-          <el-form>
-            <el-form-item label="创建语句：" style="margin-top: 20px;">
-              <el-input style="resize: none;width: 600px;" type="textarea":rows="3"></el-input>
-            </el-form-item>
-            <el-form-item label="修改日志：">
-              <el-input style="resize: none;width: 600px;" type="textarea":rows="3"></el-input>
-            </el-form-item>
-          </el-form>
-       </el-tab-pane>
-    </el-tabs>
+        <el-table ref="dragTable" @row-dblclick="dbSelected" v-loading="loading" :data="postList" row-key="columnId"
+          align="center" :max-height="tableHeight" @selection-change="handleSelectionChange1">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="id" align="center" prop="id" />
+          <el-table-column label="可用" align="center" prop="isDel">
+            <template slot-scope="scope">
+              <el-checkbox true-label="Y" disabled false-label="N" v-model="scope.row.isDel"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" align="center" prop="sort" />
+          <el-table-column label="描述" align="center" prop="description" />
+          <el-table-column label="关联表" align="center" prop="tableName" />
+          <el-table-column label="字段（关联到主表PK）" align="center" prop="columnName" />
+          <el-table-column label="显示条件" align="center" prop="displayConditions" />
+          <el-table-column label="关联方式" align="center" prop="relationType">
+            <template slot-scope="scope">
+              {{scope.row.relationType | relationTypeFn}}
+            </template>
+          </el-table-column>
+          <el-table-column label="内嵌编辑" align="center" prop="embedEdit">
+            <template slot-scope="scope">
+              {{scope.row.embedEdit | embedEditFn}}
+            </template>
+          </el-table-column>
+          <el-table-column label="修改人" align="center" prop="updateBy" />
+          <el-table-column label="修改时间" align="center" prop="updateTime" />
+        </el-table>
+        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="tabList" />
+      </el-tab-pane>
+      <el-tab-pane label="数据库SQL" name="genSql">
+        <el-row>
+          <el-button @click="zxCreaBtn" style="background-color: #FFE9ED;color: #E58481;border: 1px solid #E58481;">执行创建语句</el-button>
+          <el-button @click="sxCreaBtn" style="background-color: #FFD6B0;color: #EA551A;border: 1px solid #F4AD6B;">刷新创建语句</el-button>
+        </el-row>
+        <el-form>
+          <el-form-item label="创建语句：" style="margin-top: 20px;">
+            <div class="resizeNone" v-html="tableSqlData.createSql" style="resize: none;width: 600px;" type="textarea"></div>
 
+          </el-form-item>
+          <el-form-item label="修改日志：">
+            <div class="resizeNone" v-html="tableSqlData.createLog" style="resize: none;width: 600px;" type="textarea"></div>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="描述：" prop="postName">
-          <el-input v-model="form.postName" placeholder="请输入岗位名称" />
+          <el-input v-model="form.description" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="关联表：" prop="postCode">
-          <el-input v-model="form.postCode" placeholder="请输入编码名称" />
+        <el-form-item label="关联表：" prop="relationParentId">
+          <el-select 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="字段(关联到主表PK)：" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        <el-form-item label="字段：" prop="relationChildId">
+          <el-select 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>
         </el-form-item>
-        <el-form-item label="显示条件：" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        <el-form-item label="显示条件：" prop="displayConditions">
+          <el-input v-model="form.displayConditions" controls-position="right" placeholder="请输入显示条件" />
         </el-form-item>
-        <el-form-item label="关联方式：" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        <el-form-item label="关联方式：" prop="relationType">
+          <el-select 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="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        <el-form-item label="内嵌编辑：" prop="embedEdit">
+          <el-select 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="status">
-
+        <el-form-item label="序号：" prop="sort">
+          <el-input-number v-model="form.sort" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="可用：" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="是否可用：" prop="isDel">
+          <el-checkbox true-label="Y" false-label="N" v-model="form.isDel"></el-checkbox>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="addGlfn">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </el-card>
 </template>
 <script>
-import { getGenTable, updateGenTable, delPost} from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import { listMenu as getMenuTreeselect } from "@/api/system/menu";
-import basicInfoForm from "./basicInfoForm";
-import genInfoForm from "./genInfoForm";
-import Sortable from 'sortablejs'
+  import {
+    getGenTable,
+    updateGenTable,
+    delPost,
+    tabList,
+    listTable,
+    addGenTable,
+    setGenTable,
+    delGenTable,
+    listAllColumnsByTableId,
+    tableSql,
+    zxImplement,
+    getReload,
+    qurGenTable
+  } from "@/api/tool/gen";
+  import {
+    optionselect as getDictOptionselect
+  } from "@/api/system/dict/type";
+  import {
+    listMenu as getMenuTreeselect
+  } from "@/api/system/menu";
+  import basicInfoForm from "./basicInfoForm";
+  import genInfoForm from "./genInfoForm";
+  import Sortable from 'sortablejs'
 
-export default {
-  name: "GenEdit",
-  components: {
-    basicInfoForm,
-    genInfoForm
-  },
-  data() {
-    return {
-      title: "新增关联表",
-      open: false,
-      form: {},
-      rules: {},
-      // 选中选项卡的 name
-      activeName: "cloum",
-      // 表格的高度
-      tableHeight: document.documentElement.scrollHeight - 245 + "px",
-      // 表信息
-      tables: [],
-      // 表列信息
-      cloumns: [],
-      // 字典信息
-      dictOptions: [],
-      // 菜单信息
-      menus: [],
-      // 表详细信息
-      info: {},
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-    };
-  },
-  created() {
-    const tableId = this.$route.params && this.$route.params.tableId;
-    if (tableId) {
-      // 获取表详细信息
-      getGenTable(tableId).then(res => {
-        this.cloumns = res.data.rows;
-        this.info = res.data.info;
-        this.tables = res.data.tables;
-      });
-      /** 查询字典下拉列表 */
-      getDictOptionselect().then(response => {
-        this.dictOptions = response.data;
-      });
-      /** 查询菜单下拉列表 */
-      getMenuTreeselect().then(response => {
-        this.menus = this.handleTree(response.data, "menuId");
-      });
-    }
-  },
-  methods: {
-    /** 提交按钮 */
-    submitForm() {
-      const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
-      // const genForm = this.$refs.genInfo.$refs.genInfoForm;
-      // console.log(basicForm)
-      Promise.all([basicForm].map(this.getFormPromise)).then(res => {
-        const validateResult = res.every(item => !!item);
-        if (validateResult) {
-          const genTable = Object.assign({}, basicForm.model);
-          genTable.columns = this.cloumns;
-          // genTable.params = {
-          //   treeCode: genTable.treeCode,
-          //   treeName: genTable.treeName,
-          //   treeParentCode: genTable.treeParentCode,
-          //   parentMenuId: genTable.parentMenuId
-          // };
-          updateGenTable(genTable).then(res => {
-            this.msgSuccess(res.msg);
-            if (res.code === 200) {
-              this.close();
-            }
-          });
-        } else {
-          this.msgError("表单校验未通过，请重新检查提交内容");
-        }
-      });
+  let _this = ''
+  export default {
+    name: "GenEdit",
+    components: {
+      basicInfoForm,
+      genInfoForm
     },
-    getFormPromise(form) {
-      return new Promise(resolve => {
-        form.validate(res => {
-          resolve(res);
-        });
-      });
+    data() {
+      _this = this
+      return {
+        // 字段信息
+        tableSqlData: [],
+        columList: [],
+        foreignKey: [],
+        openZd: false,
+        formZd: {},
+        loadingZd: '',
+        // 关联表
+        title: "",
+        loading: false,
+        open: false,
+        form: {},
+        rules: {
+          relationParentId: [{
+            required: true,
+            message: "请选择关联表",
+            trigger: "blur"
+          }],
+          relationChildId: [{
+            required: true,
+            message: "请选择字段",
+            trigger: "blur"
+          }],
+          relationType: [{
+            required: true,
+            message: "请选择关联条件",
+            trigger: "blur"
+          }],
+        },
+        postList: [],
+        total: 1,
+        tableList: {},
+        // 关联方式
+
+        // 内嵌编辑
+        genList: [],
+        glbParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 关联表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 选中选项卡的 name
+        activeName: "cloum",
+        // 表格的高度
+        tableHeight: document.documentElement.scrollHeight - 245 + "px",
+        // 表信息
+        tables: [],
+        // 表列信息
+        cloumns: [],
+        // 字典信息
+        dictOptions: [],
+        // 菜单信息
+        menus: [],
+        // 表详细信息
+        info: {},
+        // 选中数组
+        ids: [],
+        ids1: [],
+        // 非单个禁用
+        single: true,
+        single1: true,
+        // 非多个禁用
+        multiple: true,
+        multiple1: true,
+        // 关联方式
+        relationType: [],
+        // 内嵌编辑
+        embedEdit: [],
+      };
     },
-    /** 关闭按钮 */
-    close() {
-      this.$store.dispatch("tagsView/delView", this.$route);
-      this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
+    filters: {
+      relationTypeFn(data) {
+        let is = ''
+        for (let item of _this.relationType) {
+          if (item.dictValue == data) {
+            is = item.dictLabel
+          }
+        }
+        return is
+      },
+      embedEditFn(data) {
+        let is = ''
+        for (let item of _this.embedEdit) {
+          if (item.dictValue == data) {
+            is = item.dictLabel
+          }
+        }
+        return is
+      },
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      console.log(selection)
-      this.ids = selection.map(item => item.columnId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-      console.log(this.ids)
+    created() {
+      const tableId = this.$route.params && this.$route.params.tableId;
+      if (tableId) {
+        // 获取表详细信息
+        getGenTable(tableId).then(res => {
+          this.cloumns = res.data.rows;
+          this.info = res.data.info;
+          this.tables = res.data.tables;
+        });
+        //查询数据库sql
+        tableSql(tableId).then(res => {
+          if(res.data){
+            this.tableSqlData = res.data
+          }
+        })
+        /** 查询字典下拉列表 */
+        getDictOptionselect().then(response => {
+          this.dictOptions = response.data;
+        });
+        // 关联字段
+        listAllColumnsByTableId({
+          tableId
+        }).then(response => {
+          this.columList = response;
+        });
+        // 关联表数据
+        listTable(this.glbParams).then(response => {
+          this.tableList = response;
+        });
+        /** 查询菜单下拉列表 */
+        // getMenuTreeselect().then(response => {
+        //   this.menus = this.handleTree(response.data, "menuId");
+        // });
+        // 关联方式
+        this.getDicts("relation_type").then(response => {
+          this.relationType = response.data;
+        });
+        // 内嵌编辑
+        this.getDicts("embed_edit").then(response => {
+          this.embedEdit = response.data;
+        });
+      }
+      this.tabList()
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除岗位编号为"' + ids + '"的数据项?', "警告", {
+    methods: {
+      submitFormZd() {
+
+      },
+      sxCreaBtn() {
+        getReload({
+          tableId: this.$route.params && this.$route.params.tableId,
+          createSql: this.tableSqlData.createSql,
+          createLog: this.tableSqlData.createLog,
+          id: this.tableSqlData.id
+        }).then(res => {
+          this.msgSuccess('刷新成功')
+        })
+      },
+      zxCreaBtn() {
+        zxImplement({
+          tableId: this.$route.params && this.$route.params.tableId,
+          createSql: this.tableSqlData.createSql,
+          createLog: this.tableSqlData.createLog,
+          id: this.tableSqlData.id
+        }).then(res => {
+          this.msgSuccess('执行成功')
+        })
+      },
+      dbSelected(row) {
+        console.log(row, 133)
+        this.reset();
+        const id = row.id
+        qurGenTable(id).then(response => {
+          let data = response.data
+          data.relationType = data.relationType + ""
+          data.embedEdit = data.embedEdit + ""
+          getGenTable(data.relationParentId).then(res => {
+            this.genList = res.data.rows;
+            this.form = response.data;
+            this.open = true;
+            this.title = "修改关联表";
+          });
+        });
+      },
+      addGlfn() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != undefined) {
+              setGenTable(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.tabList();
+              });
+            } else {
+              addGenTable(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.tabList();
+              });
+            }
+          }
+        });
+      },
+      relationFn(data) {
+        getGenTable(data).then(res => {
+          this.genList = res.data.rows;
+        });
+      },
+      loadMore() {
+        const _this = this
+        let num = _this.tableList.total % 10 == 0 ? _this.tableList.total / 10 : ((_this.tableList.total - _this.tableList
+          .total % 10) / 10 + 1)
+        console.log(num, 1)
+        if (this.glbParams.pageNum < num) {
+          this.glbParams.pageNum++
+          // 关联表数据
+          listTable(this.glbParams).then(response => {
+            let data = response
+            data.rows = _this.tableList.rows.concat(data.rows)
+            _this.tableList = data;
+          });
+        }
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+        this.openZd = false;
+        this.resetZd();
+      },
+      // 关联表数据
+      tabList() {
+        this.loading = true;
+        tabList(this.queryParams).then(response => {
+          this.postList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      /** 新增按钮操作 */
+      handleAdd_gl() {
+        this.reset();
+        this.open = true;
+        this.title = "新增关联表";
+      },
+      handleDel_gl(row) {
+        const ids = row.id || this.ids1;
+        console.log(ids, 1223)
+        this.$confirm('是否确认删除id为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delGenTable(ids);
+        }).then(() => {
+          this.tabList();
+          this.msgSuccess("删除成功");
+        })
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+
+        };
+        this.resetForm("form");
+      },
+      resetZd() {
+        this.formZd = {
+
+        };
+        this.resetForm("formZd");
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
+        // const genForm = this.$refs.genInfo.$refs.genInfoForm;
+        // console.log(basicForm)
+        Promise.all([basicForm].map(this.getFormPromise)).then(res => {
+          const validateResult = res.every(item => !!item);
+          if (validateResult) {
+            const genTable = Object.assign({}, basicForm.model);
+            genTable.columns = this.cloumns;
+            // genTable.params = {
+            //   treeCode: genTable.treeCode,
+            //   treeName: genTable.treeName,
+            //   treeParentCode: genTable.treeParentCode,
+            //   parentMenuId: genTable.parentMenuId
+            // };
+            updateGenTable(genTable).then(res => {
+              this.msgSuccess(res.msg);
+              if (res.code === 200) {
+                this.close();
+              }
+            });
+          } else {
+            this.msgError("表单校验未通过，请重新检查提交内容");
+          }
+        });
+      },
+      getFormPromise(form) {
+        return new Promise(resolve => {
+          form.validate(res => {
+            resolve(res);
+          });
+        });
+      },
+      /** 关闭按钮 */
+      close() {
+        this.$store.dispatch("tagsView/delView", this.$route);
+        this.$router.push({
+          path: "/tool/gen",
+          query: {
+            t: Date.now()
+          }
+        })
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.columnId)
+        this.single = selection.length != 1
+        this.multiple = !selection.length
+      },
+      // 多选框选中数据
+      handleSelectionChange1(selection) {
+        this.ids1 = selection.map(item => item.id)
+        this.single1 = selection.length != 1
+        this.multiple1 = !selection.length
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$confirm('是否确认删除岗位编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
           return delPost(ids);
         }).then(() => {
-          this.getList();
+          this.getlist();
           this.msgSuccess("删除成功");
         })
+      },
+      handleAdd() {
+        this.resetZd();
+        this.openZd = true;
+        this.title = "新增字段信息";
+      }
     },
-    handleAdd(){
-
-    }
-  },
-  mounted() {
-    const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
-    const sortable = Sortable.create(el, {
-      handle: ".allowDrag",
-      onEnd: evt => {
-        const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
-        this.cloumns.splice(evt.newIndex, 0, targetRow);
-        for (let index in this.cloumns) {
-          this.cloumns[index].sort = parseInt(index) + 1;
+    mounted() {
+      const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+      const sortable = Sortable.create(el, {
+        handle: ".allowDrag",
+        onEnd: evt => {
+          const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
+          this.cloumns.splice(evt.newIndex, 0, targetRow);
+          for (let index in this.cloumns) {
+            this.cloumns[index].sort = parseInt(index) + 1;
+          }
         }
-      }
-    });
-  }
-};
+      });
+    }
+  };
 </script>
+<style lang="scss">
+  .pagination-container {
+    height: 35px;
+  }
+  .resizeNone{
+     width: 70vw;
+     margin-left: 80px;
+     padding: 8px 10px;
+     border: 1px solid #CDCDCD;
+     border-radius: 3px;
+   }
+</style>