查询

boman-report/pom.xml

@@ -91,6 +91,13 @@
             <artifactId>boman-common-swagger</artifactId>
         </dependency>
 
+        <!--        远程调用 gen-->
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-api-gen</artifactId>
+            <version>2.5.0-SNAPSHOT</version>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>commons-beanutils</groupId>-->
 <!--            <artifactId>commons-beanutils</artifactId>-->

boman-report/src/main/java/com/boman/report/mapper/TableMapper.java

@@ -54,10 +54,10 @@ public interface TableMapper {
                     .append("filter_conditions, extended_attributes, table_primary_key, table_column as tableColumn")
                     .append(" from gen_table ").append(" where 1 = 1 ");
             if(StringUtils.isNotEmpty(tableName)) {
-               sql.append("AND lower(table_name) like lower(concat('%',").append(tableName).append(", '%'))");
+               sql.append("AND lower(table_name) like lower(concat('%',").append("'").append(tableName).append("'").append(", '%'))");
             }
             if(StringUtils.isNotEmpty(tableComment)) {
-                sql.append("AND lower(table_comment) like lower(concat('%',").append(tableComment).append(", '%'))");
+                sql.append("AND lower(table_comment) like lower(concat('%',").append("'").append(tableComment).append("'").append(", '%'))");
             }
             return sql.toString();
         }

boman-report/src/main/java/org/jeecg/modules/jmreport/common/ColumnConvertController.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.jmreport.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author shiqian
+ * @date 2021年08月17日 14:40
+ **/
+@RestController
+@RequestMapping("column/")
+public class ColumnConvertController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColumnConvertController.class);
+
+    @Resource
+    private ColumnCovertService columnCovertService;
+
+
+    @GetMapping("/id")
+    public void aa(){
+        columnCovertService.columnCovert("587786946755219456", "boman_message", "发文报表");
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/common/ColumnCovertService.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.jmreport.common;
+
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.dto.AjaxResult;
+import com.boman.gen.api.RemoteGenTableColumnService;
+import org.jeecg.modules.jmreport.desreport.dao.JimuReportDbDao;
+import org.jeecg.modules.jmreport.desreport.dao.JimuReportDbFieldDao;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportDbField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+import java.util.List;
+
+import static com.boman.common.core.utils.obj.ObjectUtils.*;
+
+/**
+ * @author shiqian
+ * @date 2021年08月17日 14:41
+ **/
+@Service
+public class ColumnCovertService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColumnCovertService.class);
+
+    @Resource
+    private JimuReportDbDao reportDbDao;
+    @Resource
+    private JimuReportDbFieldDao reportDbFieldDao;
+    @Resource
+    private RemoteGenTableColumnService remoteGenTableColumnService;
+
+    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
+    public List<JmReportDbField> columnCovert(String reportId, String tableName, String tableNameChn) {
+        requireNonNull(reportId, "reportId is empty");
+        requireNonNull(tableName, "tableName is empty");
+        requireNonNull(tableNameChn, "tableNameChn is empty");
+        List<JmReportDb> jmReportDbs = reportDbDao.selectList(reportId);
+        requireNonNull(jmReportDbs, "jmReportDbs is empty");
+        JmReportDb jmReportDb = jmReportDbs.get(0);
+        String jmReportDbId = jmReportDb.getId();
+        jmReportDb.setDbChName(tableNameChn);
+
+        reportDbDao.update(jmReportDb);
+
+        List<JmReportDbField> jmReportDbFields = reportDbFieldDao.listByDbId(jmReportDbId);
+        List<GenTableColumn> genTableColumns = remoteGenTableColumnService.listColumnsByTableName(tableName);
+        requireNonNull(genTableColumns, "genTableColumns is empty");
+
+        for (JmReportDbField field : jmReportDbFields) {
+            String fieldName = field.getFieldName();
+            for (GenTableColumn column : genTableColumns) {
+                if (fieldName.equalsIgnoreCase(column.getColumnName())) {
+                    field.setFieldText(column.getColumnComment());
+                    break;
+                }
+            }
+
+            // 更改filedText
+            reportDbFieldDao.update(field);
+        }
+
+        return jmReportDbFields;
+    }
+
+
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/a.java

@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.jeecg.modules.jmreport.api.data.IDataSetFactory;
+import org.jeecg.modules.jmreport.common.ColumnCovertService;
 import org.jeecg.modules.jmreport.common.annotation.JimuLoginRequired;
 import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
 import org.jeecg.modules.jmreport.common.util.CommonUtils;
@@ -43,6 +44,7 @@ import org.jeecg.modules.jmreport.common.vo.Result;
 import org.jeecg.modules.jmreport.config.JmReportBaseConfig;
 import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
 import org.jeecg.modules.jmreport.config.oss.JmReportUploadConfig;
+import org.jeecg.modules.jmreport.desreport.a.service.a.IJmReportDbService;
 import org.jeecg.modules.jmreport.desreport.entity.JimuReport;
 import org.jeecg.modules.jmreport.desreport.entity.JmReportDataSource;
 import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
@@ -53,7 +55,6 @@ import org.jeecg.modules.jmreport.desreport.render.utils.FreeMarkerUtils;
 import org.jeecg.modules.jmreport.desreport.service.IJimuReportService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbFieldService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbParamService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbSourceService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportExportExcel;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportExportPdf;
@@ -506,6 +507,7 @@ public class a {
         String var3 = var1.getString("dbSource");
         Object var4 = var1.get("paramArray");
         String var5 = var1.getString("type");
+        String tableName = var1.getString("tableName");
         Integer var6 = 0;
         JmreportDynamicDataSourceVo var7 = null;
         if (oConvertUtils.isEmpty(var3) && this.jmBaseConfig.getSaas()) {
@@ -524,7 +526,7 @@ public class a {
             }
 
             try {
-                Map var8 = this.reportDbService.parseReportSql(var2, var3, var4, var5);
+                Map var8 = this.reportDbService.parseReportSql(var2, var3, var4, var5, tableName);
                 return var8.get("message") != null ? Result.OK(var8) : Result.OK("解析成功", var8);
             } catch (Exception var10) {
                 if (var10 instanceof JimuReportException) {

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/service/a/IJmReportDbService.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.jmreport.desreport.a.service.a;
+
+
+import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportDataSource;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author shiqian
+ * @date 2021年08月18日 15:45
+ **/
+public interface IJmReportDbService {
+
+    JmReportDb saveDb(JmReportDb var1);
+
+    List<List<Map>> fieldTree(String var1);
+
+    boolean queryIsPage(String var1);
+
+    Map<String, Object> executeSelectSql(String var1, String var2, Map<String, Object> var3);
+
+    Map<String, Object> executeSelectApi(String var1, String var2, String var3, String var4, String var5);
+
+    Map loadDbData(String var1);
+
+    void delDbData(String var1);
+
+    List<JmReportDataSource> initDataSource(String var1);
+
+    void saveDbSource(JmReportDataSource var1);
+
+    boolean querySourceCode(JmReportDataSource var1);
+
+    void delDataSource(JmReportDataSource var1);
+
+    List<Map<String, Object>> qurestechSql(JmReportDb var1);
+
+    List<Map> parseData(Map<String, Object> var1);
+
+    List<Map<String, Object>> loadDataSourceTable(String var1);
+
+    Map<String, Object> loadTableData(String var1, String var2, Integer var3, Integer var4, String var5, String var6);
+
+    Map<String, Object> parseReportSql(String var1, String var2, Object var3, String var4, String tableName) throws JimuReportException;
+
+    Result addDataSource(JmReportDataSource var1, HttpServletRequest var2);
+
+    List<Map<String, Object>> queryTableName(String var1, String var2);
+
+    void updateById(JmReportDb var1);
+
+    JmReportDb getById(String var1);
+
+    int getCount(String var1, String var2);
+
+    List<JmReportDb> getListReportDb(String var1);
+
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/service/a/i.java → boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/service/a/JmReportDbService.java

@@ -25,6 +25,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 
+import com.boman.domain.GenTableColumn;
+import com.boman.gen.api.RemoteGenTableColumnService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
 import org.jeecg.modules.jmreport.common.util.ApiAssert;
@@ -36,16 +39,12 @@ import org.jeecg.modules.jmreport.common.vo.Result;
 import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
 import org.jeecg.modules.jmreport.desreport.dao.JimuReportDbDao;
 import org.jeecg.modules.jmreport.desreport.dao.JimuReportDbParamDao;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDataSource;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDbField;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDbParam;
+import org.jeecg.modules.jmreport.desreport.entity.*;
 import org.jeecg.modules.jmreport.desreport.render.handler.convert.ApiDataConvertAdapter;
 import org.jeecg.modules.jmreport.desreport.render.utils.RegexMatches;
 import org.jeecg.modules.jmreport.desreport.service.IJimuReportService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbFieldService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbParamService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportDbSourceService;
 import org.jeecg.modules.jmreport.desreport.util.d;
 import org.jeecg.modules.jmreport.desreport.util.j;
@@ -60,14 +59,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.ResourceAccessException;
 
-@Service("jmReportDbServiceImpl")
-public class i implements IJmReportDbService {
-    private static final Logger a = LoggerFactory.getLogger(i.class);
+@Service
+@Primary
+public class JmReportDbService implements IJmReportDbService {
+    private static final Logger a = LoggerFactory.getLogger(JmReportDbService.class);
     @Autowired
     private IJmReportDbParamService jmReportParamService;
     @Autowired
@@ -88,9 +89,8 @@ public class i implements IJmReportDbService {
     private ApiDataConvertAdapter apiDataConverAdapter;
     @Value("${jeecg.jmreport.apiBasePath:}")
     private String apiBasePath;
-
-    public i() {
-    }
+    @Autowired
+    private RemoteGenTableColumnService remoteGenTableColumnService;
 
     @Override
     @Transactional
@@ -125,34 +125,33 @@ public class i implements IJmReportDbService {
         this.a(reportDb);
         var7 = reportDb.getId();
         this.reportDbFieldService.deleteByReportId(var7);
-        List var9 = reportDb.getFieldList();
-        if (d.a(var9)) {
-            Iterator var4 = var9.iterator();
-
-            while (var4.hasNext()) {
-                JmReportDbField var5 = (JmReportDbField) var4.next();
-                var5.setJimuReportDbId(var7);
+        List<JmReportDbField> dbFields = reportDb.getFieldList();
+        if (d.a(dbFields)) {
+            for (JmReportDbField dbField : dbFields) {
+                dbField.setJimuReportDbId(var7);
             }
 
-            this.reportDbFieldService.saveOrUpdateBatch(var9);
+            this.reportDbFieldService.saveOrUpdateBatch(dbFields);
         }
 
         this.jmReportParamService.deleteByReportId(var7);
-        List var10 = reportDb.getParamList();
-        if (d.a(var10)) {
-            Iterator var11 = var10.iterator();
-
-            while (var11.hasNext()) {
-                JmReportDbParam var6 = (JmReportDbParam) var11.next();
-                var6.setJimuReportHeadId(var7);
-                if (var6.getSearchFlag() == null) {
-                    var6.setSearchFlag(0);
+        List<JmReportDbParam> dbParams = reportDb.getParamList();
+        if (d.a(dbParams)) {
+            for (JmReportDbParam reportDbParam : dbParams) {
+                reportDbParam.setJimuReportHeadId(var7);
+                if (reportDbParam.getSearchFlag() == null) {
+                    reportDbParam.setSearchFlag(0);
                 }
             }
 
-            this.jmReportParamService.saveOrUpdateBatch(var10);
+            this.jmReportParamService.saveOrUpdateBatch(dbParams);
         }
 
+//        JmReportDb db = new JmReportDb();
+//        db.setId(reportDb.getId());
+//        db.setDbCode(reportDb.getDbCode());
+//        db.setDbChName(reportDb.getDbChName());
+        reportDbDao.update(reportDb);
         return reportDb;
     }
 
@@ -201,6 +200,7 @@ public class i implements IJmReportDbService {
         return var2;
     }
 
+    @Override
     public boolean queryIsPage(String reportId) {
         int var2 = this.reportDbDao.getCountByReportId(reportId);
         boolean var3 = false;
@@ -211,6 +211,7 @@ public class i implements IJmReportDbService {
         return var3;
     }
 
+    @Override
     public Map<String, Object> executeSelectSql(String sql, String dbKey, Map<String, Object> params) {
         List var4 = this.jmReportParamService.list(params.get("jimuReportHeadId").toString());
         JmReportDbParam var6;
@@ -593,9 +594,10 @@ public class i implements IJmReportDbService {
         }
     }
 
-    public Map<String, Object> parseReportSql(String sql, String dbKey, Object paramArray, String type) throws JimuReportException {
-        HashMap var5 = new HashMap();
-        Object var6 = new ArrayList();
+    @Override
+    public Map<String, Object> parseReportSql(String sql, String dbKey, Object paramArray, String type, String tableName) throws JimuReportException {
+        HashMap<String, Object> var5 = new HashMap<>();
+        List<Map<String, Object>> var6 = new ArrayList<>();
         if (oConvertUtils.isNotEmpty(paramArray)) {
             sql = this.a(paramArray, sql);
         }
@@ -660,27 +662,40 @@ public class i implements IJmReportDbService {
             }
         }
 
-        if (var6 != null && ((List) var6).size() > 0) {
-            ArrayList var19 = new ArrayList();
-            Map var21 = (Map) ((List) var6).get(0);
-            int var11 = 1;
-            Iterator var12 = var21.entrySet().iterator();
-
-            while (var12.hasNext()) {
-                Entry var13 = (Entry) var12.next();
-                String var14 = ((String) var13.getKey()).toLowerCase();
-                LinkedHashMap var15 = new LinkedHashMap();
-                var15.put("fieldName", var14);
-                var15.put("fieldText", var14);
-                var15.put("widgetType", "String");
-                var15.put("orderNum", var11++);
-                var19.add(var15);
-            }
 
-            var5.put("fieldList", var19);
-            var5.put("paramList", var7);
+        if (CollectionUtils.isEmpty(var6)) {
+            return var5;
+        }
+
+        // 查询我们自己的gen_table_column
+        List<GenTableColumn> columns = remoteGenTableColumnService.listColumnsByTableName(tableName);
+        if (CollectionUtils.isEmpty(columns)) {
+            return var5;
+        }
+
+        List<LinkedHashMap<String, Object>> var19 = new ArrayList<>();
+        Map<String, Object> limitOne = var6.get(0);
+
+        int cnt = 1;
+        for (Entry<String, Object> entry : limitOne.entrySet()) {
+            String limitOneColumnName = entry.getKey().toLowerCase();
+            for (GenTableColumn column : columns) {
+                if (!column.getColumnName().equals(limitOneColumnName)) {
+                    continue;
+                }
+
+                LinkedHashMap<String, Object> temp = new LinkedHashMap<>();
+                temp.put("fieldName", limitOneColumnName);
+                temp.put("fieldText", column.getColumnComment());
+                temp.put("widgetType", "String");
+                temp.put("orderNum", cnt++);
+                var19.add(temp);
+                break;
+            }
         }
 
+        var5.put("fieldList", var19);
+        var5.put("paramList", var7);
         return var5;
     }
 

boman-report/src/main/resources/static/jmreport/desreport_/js/biz/view.js

@@ -592,6 +592,38 @@ let xs = null;
                                      //导出全部excel
                                      //window.open(baseFull+`/jmreport/exportAllExcel/${excelConfigId}?token=${token}`);
                                      xs.getLayerBase64().then(values=>{
+                                         base64Arry = values;
+                                         var dataStr = '';
+                                         let queryParam  = rpViewInst.getRpQueryParam();
+                                         let pageInfo = xs.getPageInfo();
+                                         queryParam.pageNo = pageInfo.pageNo
+                                         queryParam.pageSize = pageInfo.pageSize
+                                         if (base64Arry != null && base64Arry.length > 0){
+                                             dataStr = JSON.stringify({excelConfigId:excelConfigId,base64Arry:base64Arry,queryParam: queryParam});
+                                         }else {
+                                             dataStr = JSON.stringify({excelConfigId:excelConfigId, queryParam:queryParam});
+                                         }
+                                         Vue.prototype.$Spin.show();
+                                         $http.post({
+                                             contentType:'json',
+                                             url:api.exportAllExcel,
+                                             data : dataStr,
+                                             success:(result)=>{
+                                                 console.log(1234)
+                                                 ajaxFileDownload(result.file, result.name);
+                                             },
+                                             error:(e)=>{
+                                                 Vue.prototype.$Spin.hide();
+                                                 xs.tip(e.error);
+                                             }
+                                         })
+                                     })
+                                 })
+                                 .onExportExcelEmpty(function(){
+                                     //导出全部excel
+                                     //window.open(baseFull+`/jmreport/exportAllExcel/${excelConfigId}?token=${token}`);
+                                     xs.getLayerBase64().then(values=>{
+                                         console.log("你是谁")
                                          base64Arry = values;
                                          var dataStr = '';
                                          let queryParam  = rpViewInst.getRpQueryParam();

boman-report/src/main/resources/static/jmreport/desreport_/js/core/api.js

@@ -62,6 +62,8 @@ const api = {
 
     //导出全部excel
     exportAllExcel: getOrigin('/exportAllExcel'),
+    // 导出excel模板
+    exportEmptyExcel: getOrigin('/exportEmptyExcel'),
     //导出全部Pdf
     exportPdf: getOrigin('/exportPdf'),
     //预览次数

boman-report/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl

@@ -82,36 +82,36 @@
                     <div style="margin-left: 20px">
                         <i-form ref="sqlForm"
                                 :model="sqlForm"
-                                :rules="sqlFormValidate"
+<#--                                :rules="sqlFormValidate"-->
                                 inline :label-width="85">
                             <Row span="24">
-                                <i-col span="4">
-                                    <form-item prop="dbCode" label="编码:">
-                                        <i-input :disabled ="sqlForm.id!='' && sqlForm.id!=undefined" style="width: 153px" type="text" v-model="sqlForm.dbCode" placeholder="请输入编码">
-                                        </i-input>
-                                    </form-item>
-                                </i-col>
+<#--                                <i-col span="4">-->
+<#--                                    <form-item prop="dbCode" label="编码:">-->
+<#--                                        <i-input :disabled ="sqlForm.id!='' && sqlForm.id!=undefined" style="width: 153px" type="text" v-model="sqlForm.dbCode" placeholder="请输入编码">-->
+<#--                                        </i-input>-->
+<#--                                    </form-item>-->
+<#--                                </i-col>-->
                                 <i-col span="4" style="margin-left: 20px;">
-                                    <form-item prop="dbChName" label="名称">
-                                        <i-input type="text" style="width: 200px" v-model="sqlForm.dbChName" placeholder="请输入名称">
+                                    <form-item prop="tableComment" label="名称">
+                                        <i-input type="text" style="width: 200px" @on-change="initTables" v-model="sqlForm.tableComment" placeholder="请输入名称">
                                         </i-input>
                                     </form-item>
                                 </i-col>
-                                <i-col span="3">
-                                    <form-item>
-                                        <Checkbox :checked.sync="sqlForm.isList" v-model="sqlForm.isList" @on-change="isListChange" style="width: 100px;margin-left: 10%">是否集合</Checkbox>
-                                    </form-item>
-                                </i-col>
-                                <i-col span="3">
-                                    <form-item>
-                                        <#--<Checkbox :checked.sync="sqlForm.isPage" v-if="addIsPage == true" disabled v-model="sqlForm.isPage">是否分页</Checkbox>-->
-                                        <Checkbox :checked.sync="sqlForm.isPage" v-if="sqlForm.isList == true && sqlForm.dbType != 3" v-model="sqlForm.isPage" @on-change="checkChange" style="width: 100px">是否分页
-                                          <Tooltip :transfer="true" content="分页文档" placement="top" class="jimu-tooltip">
-                                            <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2084139" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                          </Tooltip>
-                                        </Checkbox>
-                                    </form-item>
-                                </i-col>
+<#--                                <i-col span="3">-->
+<#--                                    <form-item>-->
+<#--                                        <Checkbox :checked.sync="sqlForm.isList" v-model="sqlForm.isList" @on-change="isListChange" style="width: 100px;margin-left: 10%">是否集合</Checkbox>-->
+<#--                                    </form-item>-->
+<#--                                </i-col>-->
+<#--                                <i-col span="3">-->
+<#--                                    <form-item>-->
+<#--                                        &lt;#&ndash;<Checkbox :checked.sync="sqlForm.isPage" v-if="addIsPage == true" disabled v-model="sqlForm.isPage">是否分页</Checkbox>&ndash;&gt;-->
+<#--                                        <Checkbox :checked.sync="sqlForm.isPage" v-if="sqlForm.isList == true && sqlForm.dbType != 3" v-model="sqlForm.isPage" @on-change="checkChange" style="width: 100px">是否分页-->
+<#--                                          <Tooltip :transfer="true" content="分页文档" placement="top" class="jimu-tooltip">-->
+<#--                                            <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2084139" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                          </Tooltip>-->
+<#--                                        </Checkbox>-->
+<#--                                    </form-item>-->
+<#--                                </i-col>-->
                                 <i-col span="3" v-if="sqlForm.dbType == 1">
                                     <form-item prop="apiMethod" label="请求方式:">
                                         <i-select  style="width: 153px" v-model="sqlForm.apiMethod" placeholder="请输入请求方式">
@@ -690,6 +690,7 @@
                 },
                 sqlForm: {
                     dbCode: "",
+                    tableComment: "",
                     dbChName: "",
                     dbDynSql: "",
                     dbType: "",
@@ -1126,6 +1127,8 @@
                                 reportNewDb[key]=reportDb[key]
                             }
                         }
+                        let tabId = this.genTable.selectParamTables;
+                        reportNewDb.dbChName = tabId[0].tableComment;
                         $http.post({
                             url: api.saveDb,
                             contentType:'json',
@@ -1310,9 +1313,9 @@
                     alert("仅选择一条数据！");
                     return;
                 }
-                debugger
+
                 let dbDynSql = "select * from " +  tabId[0].tableName;
-                let reqData = {'sql': dbDynSql, 'dbSource': dbSource,'type':type=='1'?'1':'0'}
+                let reqData = {'sql': dbDynSql, 'dbSource': dbSource,'type':type=='1'?'1':'0', "tableName": tabId[0].tableName}
                 if(type=='1'){
                     reqData['paramArray'] = JSON.stringify(this.tab2.data);
                 }
@@ -1535,11 +1538,11 @@
 
             selectTableAll(){
                 this.genTable.selectParamTables = this.genTable.data.map(item=> {
-                    return {"tableIndex":item.tableIndex,"id":item.id,"tableName":item.tableName}
+                    return {"tableIndex":item.tableIndex,"id":item.id,"tableName":item.tableName,"tableComment":row.tableComment}
                 });
             },
             selectTableField(selection,row){
-                this.genTable.selectParamTables=[...this.genTable.selectParamTables, {"tableIndex":row.tableIndex,"id":row.id,"tableName":row.tableName}];
+                this.genTable.selectParamTables=[...this.genTable.selectParamTables, {"tableIndex":row.tableIndex,"id":row.id,"tableName":row.tableName,"tableComment":row.tableComment}];
             },
             cancelTableAll() {
                 this.genTable.selectParamTables = [];
@@ -1548,7 +1551,6 @@
                 this.genTable.selectParamTables = this.genTable.selectParamTables.filter(item=>item.tableIndex != row.tableIndex);
             },
             changepage(index) {
-                debugger
                 //需要显示开始数据的index,(因为数据是从0开始的，页码是从1开始的，需要-1)
                 let _start = (index - 1) * this.pageSize;
                 //需要显示结束数据的index