⬆️ Upgrading dependencies. jimu 最新稳定版

db/6pigxx_config.sql

@@ -44,7 +44,7 @@ INSERT INTO `config_info` VALUES (9, 'pigx-pay-platform-dev.yml', 'DEFAULT_GROUP
 INSERT INTO `config_info` VALUES (11, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  resources:\n    static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - wx_mp_menu\n      - wx_account\n      - wx_account_tag\n      - wx_account_fans\n      - wx_msg\n      - wx_auto_reply', 'ea4e59c98b8aeb4dd78ec989e7f197a4', '2022-12-16 10:44:25', '2023-01-29 13:12:59', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (12, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n  job:\n    i18n: zh_CN\n    logretentiondays: 30\n    triggerpool:\n      fast.max: 200\n      slow.max: 200\n\n# mybatis\nmybatis:\n  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  mvc:\n    static-path-pattern: /static/**\n  freemarker:\n    suffix: .ftl\n    request-context-attribute: request\n    settings:\n      number_format: 0.##########\n  mail:\n    host: smtp.mxhichina.com\n    port: 465\n    from: xxxx@gitee.wang\n    username: xxxx@gitee.wang\n    password: xxxx\n    properties:\n      mail:\n        smtp:\n          auth: true\n          ssl.enable: true\n          starttls.enable: false\n          required: false\n\nmanagement:\n  health:\n    mail:\n      enabled: false\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n  endpoint:\n    health:\n      show-details: ALWAYS', '6d70dce1f3ee48f261dce29bcfa99cbb', '2022-12-16 10:44:25', '2023-01-04 18:22:48', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (13, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n  jpa:\n    database-platform: org.hibernate.dialect.MySQL8Dialect\n\nsecurity:\n  oauth2:\n    client:\n      ignore-urls:\n        - /\n        - /api/project/getData\n        - /static/**\n        - /api/project/get-file/*\n\n# 文件上传路径\ngv:\n  img-path: /Users/lengleng/Downloads/img/\n', 'ce3fde4b4592cdd61feb2e443b2ddfe5', '2022-12-16 10:44:25', '2023-04-07 12:56:57', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    saas: true\n    openTenant: true\n    #saasMode: tenant\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '1397b44dcc28a7fb5fd455805b932983', '2022-12-16 10:44:25', '2023-09-08 13:06:11', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (14, 'pigx-jimu-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n  #配置静态资源\n  mvc:\n    static-path-pattern: /**\n  resource:\n    static-locations: classpath:/static/\n  #配置数据库\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n   \n#JimuReport[minidao配置]\nminidao :\n  base-package: org.jeecg.modules.jmreport.desreport.dao*\n  db-type: mysql\n#JimuReport[上传配置]\njeecg :\n  jmreport:\n    saasMode: tenant\n    #saasMode: tenant\n    customPrePath: /api/jimu\n    # 自动保存\n    autoSave: true\n    # 单位毫秒 默认5*60*1000 \n    interval: 10000\n  # local|minio|alioss\n  uploadType: local\n  # local\n  path :\n    #文件路径A\n    upload: ~/jimu/data\n  # alioss\n  oss:\n    endpoint: oss-cn-beijing.aliyuncs.com\n    accessKey: ??\n    secretKey: ??\n    staticDomain: ??\n    bucketName: ??\n  # minio\n  minio:\n    minio_url: http://minio.jeecg.com\n    minio_name: ??\n    minio_pass: ??\n    bucketName: ??\n#输出sql日志\nlogging:\n  level:\n    org.jeecg.modules.jmreport : debug', '3f53ce5ae7d2832a546929af4a7e57d1', '2022-12-16 10:44:25', '2023-09-22 14:58:36', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (15, 'pigx-app-server-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_app}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - app_user\n      - app_role\n      - app_article\n      - app_article_category\n      - app_article_collect\n      - app_page\n      - app_tabbar', '2513bb14ce549a2a4ea1cdfd83bba1f3', '2022-12-19 10:30:07', '2023-06-20 18:15:07', 'nacos', '127.0.0.1', '', '', '', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (16, 'pigx-flow-engine-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true', '233121e20445609e1ba378c3686ea7d5', '2023-07-28 13:41:32', '2023-07-28 13:43:36', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 工作引擎', '', '', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (17, 'pigx-flow-task-biz-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_flow}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - process\n      - process_copy\n      - process_group\n      - process_instance_record\n      - process_node_data\n      - process_node_record\n      - process_node_record_assign_user\n      - process_starter', 'bdead04cdd3666d04786f69e5fb32633', '2023-07-28 13:44:25', '2023-07-28 13:50:08', 'nacos', '0:0:0:0:0:0:0:1', '', '', 'flowable 业务', '', '', 'yaml', '', '');

db/99pigxx_bi.sql

@@ -17,7 +17,7 @@ CREATE TABLE `jimu_dict`  (
   `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `type` int(1) UNSIGNED ZEROFILL NULL DEFAULT 0 COMMENT '字典类型0为string,1为number',
-  `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
+  `tenant_id` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `uk_sd_dict_code`(`dict_code`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
@@ -332,7 +332,7 @@ CREATE TABLE `jimu_report`  (
   `view_count` bigint(0) NULL DEFAULT 0 COMMENT '浏览次数',
   `css_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'css增强',
   `js_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'js增强',
-  `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
+  `tenant_id` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `uniq_jmreport_code`(`code`) USING BTREE,
   INDEX `uniq_jmreport_createby`(`create_by`) USING BTREE,
@@ -405,7 +405,7 @@ CREATE TABLE `jimu_report_data_source`  (
   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
   `connect_times` int(0) UNSIGNED NULL DEFAULT 0 COMMENT '连接失败次数',
-  `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
+  `tenant_id` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
   `type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型(report:报表;drag:仪表盘)',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_jmdatasource_report_id`(`report_id`) USING BTREE,

pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java

@@ -38,6 +38,9 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
 				.orElse(null);
 		// @formatter:off
 	}
+	@Override public String[] getRoles(String s) {
+    return new String[0];
+    }
 
 	@Override
 	public Map<String, Object> getUserInfo(String token) {

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl

@@ -1,4 +1,4 @@
-<#assign CACHE_VERSION = "v=1693888295.10">
+<#assign CACHE_VERSION = "v=1694491301.10">
 <!DOCTYPE html>
 <html>
 <head>

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl

@@ -1,4 +1,4 @@
-<#assign CACHE_VERSION = "v=1693888295.10">
+<#assign CACHE_VERSION = "v=1694491301.10">
 <#assign config_id = "${id!''}">
 <!DOCTYPE html>
 <html>
@@ -582,9 +582,22 @@
                                         <i-option value="img" key="2" class="rightFontSize">图片</i-option>
                                         <i-option value="barcode" key="3" class="rightFontSize">条形码</i-option>
                                         <i-option value="qrcode" key="4" class="rightFontSize">二维码</i-option>
+                                        <i-option value="richText" key="5" class="rightFontSize">富文本?</i-option>
                                         <#--<i-option value="chart" key="5">图表</i-option>-->
                                     </i-select>
                                   </div>
+                                  <div class="basicSettingTop rightFontSize" v-if="excel.type == 'img'">
+                                    <span>尺寸?</span>
+                                      <i-select class="twoInputWidth" v-model="excel.imgSize" @on-change="onChangeCellImgSize">
+                                          <i-option value="0" key="0" class="rightFontSize">完全覆盖(cover)</i-option>
+                                          <i-option value="1" key="1" class="rightFontSize">适应内容(contain)</i-option>
+                                          <i-option value="2" key="2" class="rightFontSize">width100%--center</i-option>
+                                          <i-option value="3" key="3" class="rightFontSize">height100%--center</i-option>
+                                          <i-option value="4" key="4" class="rightFontSize">居中显示</i-option>
+                                          <i-option value="5" key="5" class="rightFontSize">拉伸(100% 100%)</i-option>
+                                      </i-select>
+                                  </div>
+
                                   <div class="basicSettingTop rightFontSize">
                                     <span>值</span>
                                     <i-input @on-click="enlargeInputClick" icon="md-contract" style="margin-left: 16px;" v-model="excel.excelValue" @keyup.enter.native="submitValue" @on-blur="submitValue" class="twoInputWidth"></i-input>
@@ -1036,6 +1049,7 @@
 
     var excel_config_id = "${config_id}";
     var excel_req_token = '';
+    var excel_req_tenantId = '';
     var xs = null;
     var vm = null;
     let autoSaveFun;
@@ -1054,6 +1068,11 @@
             token = getRequestUrl().token;
         }
         excel_req_token = token
+        let tenantId = window.localStorage.getItem('JmReport-Tenant-Id');
+        if (tenantId == "" || tenantId == null){
+            tenantId = getRequestUrl().tenantId;
+        }
+        excel_req_tenantId = tenantId;
         //console.log("index_load--------------",token);
         let reportConfig = getReportConfigJson();
         let colLength = 50,rowLength = 100, viewPageSize = [10,20,30], printPaper = []
@@ -1264,33 +1283,45 @@
             if(excel_req_token && excel_req_token!="null"){
               xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?token='+excel_req_token
             }
+            if(excel_req_tenantId && excel_req_tenantId!=="null"){
+                if(xs.data.settings.viewUrl.indexOf("?") !== -1){
+                    xs.data.settings.viewUrl = xs.data.settings.viewUrl +'&tenantId='+excel_req_tenantId
+                }else{
+                    xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?tenantId='+excel_req_tenantId
+                }
+            }
             //update-end---author:wangshuai ---date:20220215  for：[issues/I4SOSH]做完的积木报表，预览生成的访问地址，默认都加了token=null------------
             var str = res.jsonStr;
             if(!str) return;
             //页面加载时设置报表宽度
-            const jsonStr = JSON.parse(str);
+            try{
-            //console.log('jsonstr', jsonStr)
+                const jsonStr = JSON.parse(str);
-            // 设置增强
+                //console.log('jsonstr', jsonStr)
-            vm.setEnhanceConfig(res.cssStr, res.jsStr)
+                // 设置增强
-            if(jsonStr.chartList)
+                vm.setEnhanceConfig(res.cssStr, res.jsStr)
-            {
+                if(jsonStr.chartList)
-                jsonStr.chartList.forEach(function(item){
+                {
-                    let config = JSON.parse(item.config);
+                    jsonStr.chartList.forEach(function(item){
-                    if (config.geo){
+                        let config = JSON.parse(item.config);
-                        if (loadMap){
+                        if (config.geo){
-                            loadMap && loadMap(item)
+                            if (loadMap){
+                                loadMap && loadMap(item)
+                            }
                         }
-                    }
+                    })
-                })
-            }
-            xs.data.settings.printElWidth = jsonStr.printElWidth || 0;
-            xs.data.printElHeight = jsonStr.printElHeight ||  1047; //默认a4纸大小
-          //  xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value =  xs.data.printElHeight;
-            xs.loadData(jsonStr);
-            if(jsonStr.settings){
-                if(jsonStr.settings.showGrid == false){
-                    vm.gridLine = "false"
                 }
+                xs.data.settings.printElWidth = jsonStr.printElWidth || 0;
+                xs.data.printElHeight = jsonStr.printElHeight ||  1047; //默认a4纸大小
+                //  xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value =  xs.data.printElHeight;
+                xs.loadData(jsonStr);
+                if(jsonStr.settings){
+                    if(jsonStr.settings.showGrid == false){
+                        vm.gridLine = "false"
+                    }
+                }
+            }catch(error){
+                console.error('jsonStr数据解析报错:', error)
+                vm.$Message.warning('配置有误,请检查数据JSON配置项！');
             }
             setTimeout(function(){
                 if (xs.data.chartList && xs.data.chartList.length > 0){

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl

@@ -1,4 +1,4 @@
-<#assign CACHE_VERSION = "v=1693888295.10">
+<#assign CACHE_VERSION = "v=1694491301.10">
 <!DOCTYPE html>
 <html>
 <head>
@@ -143,6 +143,10 @@
                             <Icon type="md-list"/></Icon>
                             <span>数据报表</span>
                         </Menu-Item>
+                        <Menu-Item name="chartinfo">
+                            <Icon type="md-images"></Icon>
+                            <span>图形报表</span>
+                        </Menu-Item>
                         <Menu-Item name="printinfo">
                             <Icon type="md-print"></Icon>
                             <span>打印设计</span>
@@ -425,6 +429,7 @@
         data: {
             isCollapsed: false,
             token:'',//token
+            tenantId:'',//租户id
             name:'',
             designerObj:{},
             loading:true,
@@ -501,7 +506,8 @@
         },
         mounted:function(){
            this.token = token;
-            //console.log("list_mount--------------",this.token);
+           this.tenantId = tenantId;
+           //console.log("list_mount--------------",this.token);
            this.uploadHeader = {"X-Access-Token":this.token};
            this.actionUrl=BASE_URL+"/jmreport/putFile";
            this.$nextTick(()=>{
@@ -617,14 +623,27 @@
              */
             splicingToken(url){
               if(this.token && "null" != this.token){
-                if(url.indexOf("?")!=-1){
+                  url = this.splicingUrl("token",this.token,url);
-                  url =url + "&token="+this.token;
+              }
-                }else{
+              if(this.tenantId && "null" !== this.tenantId){
-                  url =url + "?token="+this.token;
+                  url = this.splicingUrl("tenantId",this.tenantId,url);
-                }
               }
               return url;
             },
+            /**
+             * 拼接路径
+             * @param name
+             * @param value
+             * @param url
+             */
+            splicingUrl(name, value, url) {
+                if (url.indexOf("?") !== -1) {
+                    url = url + "&" + name + "=" + value;
+                } else {
+                    url = url + "?" + name + "=" + value;
+                }
+                return url;
+            },
             //删除报表
             handleDelete:function(item){
                 $http.confirm({

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl

@@ -856,10 +856,6 @@
                                 }
                             }
                         },
-                        {
-                            title: '用户名',
-                            key: 'dbUsername'
-                        },
                         {
                             title: '操作',
                             key: 'action',
@@ -1472,8 +1468,10 @@
                             //Vue.prototype.$Message.error(message);
                             //弹窗sql解析报错字段
                             if(dbDynSql.indexOf("$")!=-1){
-                              this.$refs.sqlFunctionReplace.sqlFunctionShow = true
+                                if(this.tab2.data.length>0){
-                              this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql, this.sqlForm.dbSource, this.tab2.data)
+                                    this.$refs.sqlFunctionReplace.sqlFunctionShow = true
+                                    this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql, this.sqlForm.dbSource, this.tab2.data)
+                                }
                             }else{
                               Vue.prototype.$Message.error(message);
                             }
@@ -1529,9 +1527,11 @@
                     fail:(res)=>{
                       //1001注入异常
                       if(res.code!=1001 && type!=1){
-                        //弹窗sql解析报错字段
+                          if(this.tab2.data.length>0){
-                        this.$refs.sqlFunctionReplace.sqlFunctionShow = true
+                              //弹窗sql解析报错字段
-                        this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql,this.sqlForm.dbSource,this.tab2.data)
+                              this.$refs.sqlFunctionReplace.sqlFunctionShow = true
+                              this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql,this.sqlForm.dbSource,this.tab2.data)
+                          }
                       }
                     }
                 })
@@ -2126,12 +2126,14 @@
                         },
                         on: {
                             click: () => {
-                                this.sourceTab.data.forEach((item)=>{
+                                $http.get({
-                                    if (item.id === params.row.id){
+                                    url: api.getDataSourceById,
-                                        this.dataSource = item;
+                                    data:{'id': params.row.id},
+                                    success:(result)=>{
+                                        this.visibleData = true;
+                                        this.dataSource = result;
                                     }
                                 })
-                                this.visibleData = true;
                             }
                         }
                     },'编辑'),

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl

@@ -1066,7 +1066,6 @@
                                                 this.$Notice.success({
                                                     title: '删除成功'
                                                 });
-                                                this.initDataSource();
                                             }
                                         });
                                     }

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl

@@ -79,6 +79,34 @@
                     </i-col>
                 </Row>
 
+                <Row style="margin-top: 8px">
+                    <i-col span="6">
+                        <span>显示页码?：</span>
+                    </i-col>
+                    <i-col span="18">
+                        <i-switch v-model="paginationShow"></i-switch>
+                    </i-col>
+                </Row>
+
+                <Row style="margin-top: 8px" v-if="paginationShow">
+                    <i-col span="6">
+                        <span>页码位置?：</span>
+                    </i-col>
+                    <i-col span="18">
+                        <RadioGroup v-model="paginationLocation">
+                            <Radio label="left" border>
+                                <span>左</span>
+                            </Radio>
+                            <Radio label="middle" border>
+                                <span>中</span>
+                            </Radio>
+                            <Radio label="right" border>
+                                <span>右</span>
+                            </Radio>
+                        </RadioGroup>
+                    </i-col>
+                </Row>
+
             </i-form>
         </Modal>
     </div>
@@ -128,7 +156,8 @@
                 marginX: 10,
                 marginY: 10,
                 layout: 'portrait',
-                printCallBackUrl: ''
+                paginationShow: true,
+                paginationLocation: 'middle',
             }
         },
         created(){
@@ -169,7 +198,9 @@
                   marginX: this.marginX || 0,
                   marginY: this.marginY || 0,
                   layout: this.layout,
-                  printCallBackUrl: this.printCallBackUrl
+                  printCallBackUrl: this.printCallBackUrl,
+                  paginationShow: this.paginationShow,
+                  paginationLocation: this.paginationLocation,
               }
             },
             // 纸张大小改变事件
@@ -247,6 +278,10 @@
                         this.isBackend = param.isBackend
                     }
                     this.printCallBackUrl = param.printCallBackUrl || ''
+                    this.paginationShow = param.paginationShow || false
+                    if(param.paginationLocation){
+                        this.paginationLocation = param.paginationLocation
+                    }
                 }
             },
             // 重置宽高px的值

pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl

@@ -1,4 +1,4 @@
-<#assign CACHE_VERSION = "v=1693888295.10">
+<#assign CACHE_VERSION = "v=1694491301.10">
 <#assign config_id = "${id!''}">
 <#assign shareView = "${shareView}">
 <!DOCTYPE html>
@@ -220,14 +220,14 @@ function getLocalRequestUrl() {
                                         <template v-else-if="item.type=='number'">
                                             <Row v-if="item.mode==2">
                                                 <i-col span="11">
-                                                    <i-input :ref="item.key+'_begin'"  v-model="queryInfo[item.key+'_begin']" type="number" :placeholder="'请输入起始值'" clearable></i-input>
+                                                    <input-number :ref="item.key+'_begin'"  v-model="queryInfo[item.key+'_begin']" :placeholder="'请输入起始值'" clearable style="width: 100%"></input-number>
                                                 </i-col>
                                                 <i-col span="2" style="text-align: center">&nbsp;~</i-col>
                                                 <i-col span="11">
-                                                    <i-input :ref="item.key+'_end'" v-model="queryInfo[item.key+'_end']" type="number" :placeholder="'请输入结束值'" clearable></i-input>
+                                                    <input-number :ref="item.key+'_end'" v-model="queryInfo[item.key+'_end']" :placeholder="'请输入结束值'" clearable style="width: 100%"></input-number>
                                                 </i-col>
                                             </Row>
-                                            <i-input v-else :ref="item.key" class="jm-select-box" type="number" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
+                                            <input-number v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable style="width: 100%"></input-number>
                                         </template>
 
                                         <!-- 默认输入框 模糊查询参数加* -->
@@ -287,7 +287,7 @@ function getLocalRequestUrl() {
             <i-button type="primary" @click="lockClick('${config_id}')">确定</i-button>
         </div>
         <div style="padding-right: 30px">
-            <i-form label-colon :label-width="90">
+            <i-form label-colon :label-width="90" @keydown.native.enter.prevent="lockClick('${config_id}')">
                 <form-item label="密码">
                     <i-input v-model="lock" placeholder="请输入密码"></i-input>
                 </form-item>

pom.xml

@@ -54,7 +54,7 @@
         <ttl.version>2.12.6</ttl.version>
         <jaxb.version>2.3.5</jaxb.version>
         <ureport.version>2.2.9</ureport.version>
-        <jimu.version>1.6.2-beta</jimu.version>
+        <jimu.version>1.6.2-GA5</jimu.version>
         <aws.version>1.11.543</aws.version>
         <xxl.job.version>2.4.0</xxl.job.version>
         <flowable.version>6.8.0</flowable.version>