zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies. jimu 1.6.2 支持配置多租户

Browse Source
This commit is contained in:
lbw committed 2023-09-08 13:13:11 +08:00
1 parent b7b2f102c7
commit 8e35b50e1d
17 files changed
+995 -922
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

db/6pigxx_config.sql
+1 -1
View File
@@ -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 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', '66319da04963c4c7217f807bf1bd5f2d', '2022-12-16 10:44:25', '2023-04-07 13:12:32', '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 (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', '', '');
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl
+1 -1
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1.0.13">
<#assign CACHE_VERSION = "v=1693888295.10">
<!DOCTYPE html>
<html>
<head>
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl
+1 -1
View File
@@ -5,7 +5,7 @@
var s = document.createElement('script');
s.type = 'text/javascript';
s.async = true;
s.src = "https://hm.baidu.com/hm.js?5819d05c0869771ff6e6a81cdec5b2e8";
s.src = "https://hm.baidu.com/hm.js?b756a4a8e1c58d613e27d1459c6d6076";
var x = document.getElementsByTagName('script')[0];
x.parentNode.insertBefore(s, x);
}
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl
+783 -774
View File
File diff suppressed because it is too large. Load diff
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl
+21 -13
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1.0.13">
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign config_id = "${id!''}">
<!DOCTYPE html>
<html>
@@ -490,7 +490,7 @@
<div style="width:95%;height: 30px;border: none;margin-left: 10px; z-index:999;cursor: pointer;margin-left:27px">
<span class="rightFontSize">数据集管理
<Tooltip :transfer="true" content="数据源管理文档" placement="left" class="jimu-tooltip">
<a class=" help-color" href="http://report.jeecg.com/1835711" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
<a class=" help-color" href="https://help.jeecg.com/jimureport/base/dataSet.html" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
</Tooltip>
</span>
<Dropdown @on-click="onMenuSelect" placement="bottom-start" :transfer="true">
@@ -537,7 +537,7 @@
<div style="width:100%;height: 45px;border: none;margin-left: 25px;cursor: pointer;margin-top: 10px">
<span @click="createDictClick" class="rightFontSize">数据字典<i style="position: relative;left:100px;font-size: 14px;" class="ivu-icon ivu-icon-md-create"></i></span>
<Tooltip :transfer="true" content="数据字典文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2083759" target="_blank" style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/dictionary.html" target="_blank" style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
</Tooltip>
</div>
</i-menu>
@@ -606,7 +606,7 @@
<template slot="title">
<span class="rightFontSize">补充空白行
<Tooltip :transfer="true" content="补充空白行文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2361240" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/base/completeLines.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -628,7 +628,7 @@
<template slot="title">
<span class="rightFontSize">分组设置
<Tooltip :transfer="true" content="分组设置文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2032023" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/group.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -651,6 +651,10 @@
<i-option class="rightFontSize" v-for="item in sortType" :value="item.value">{{ item.label }}</i-option>
</i-select>
</div>
<div class="basicSettingTop rightFontSize">
<span>自定义文本排序</span>
<i-input v-model="excel.textOrders" :autosize="true" type="textarea" @on-change="selectTextOrders" placeholder="文本以|分割，示例：1月|2月|3月"></i-input>
</div>
<div class="basicSettingTop rightFontSize">
<span>高级配置</span>
<i-select :transfer="true" :model.sync="excel.advanced" :transfer="true" v-model="excel.advanced" @on-change="selectAdvancedList" class="fourInputWidth">
@@ -664,7 +668,7 @@
<template slot="title">
<span class="rightFontSize">小计设置
<Tooltip :transfer="true" content="分组小计文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2333594" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/group/verticalSubtotal.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -690,7 +694,7 @@
<template slot="title">
<span class="rightFontSize">超链接设置
<Tooltip :transfer="true" content="超链接文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2232719" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/linkage.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -719,7 +723,7 @@
<template slot="title">
<span class="rightFontSize">其他设置
<Tooltip :transfer="true" content="数据格式化文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2084138" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/base/dataFormat.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -736,7 +740,7 @@
<template slot="title">
<span class="rightFontSize">主子报表参数设置
<Tooltip :transfer="true" content="主子报表文档" placement="left" class="jimu-tooltip">
<a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2296481" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color help-margin" href="https://help.jeecg.com/jimureport/datareport/masterReport.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</template>
@@ -1050,15 +1054,18 @@
token = getRequestUrl().token;
}
excel_req_token = token
console.log("index_load--------------",token);
//console.log("index_load--------------",token);
let reportConfig = getReportConfigJson();
let colLength = 50, viewPageSize = [10,20,30], printPaper = []
let colLength = 50,rowLength = 100, viewPageSize = [10,20,30], printPaper = []
if(reportConfig['pageSize']){
viewPageSize = reportConfig['pageSize']
}
if(reportConfig['col']){
colLength = reportConfig['col']
}
if(reportConfig['row']){
rowLength = reportConfig['row']
}
if(reportConfig['printPaper']){
printPaper = reportConfig['printPaper']
}
@@ -1082,7 +1089,7 @@
width: () => document.documentElement.clientWidth,
},
row: {
len: 100,
len: rowLength,
height: 25,
minRowResizerHeight:1 //拖拽行最小高度
},
@@ -1113,6 +1120,7 @@
x.spreadsheet.locale('zh-cn');
xs = x.spreadsheet('#jm-sheet-wrapper', options)
.onSave(function (data) {
console.log("data: ", data)
//设置报表打印宽度
const dataRect = xs.data.getDataRect();
let dataRectWidth = 0;
@@ -1261,7 +1269,7 @@
if(!str) return;
//页面加载时设置报表宽度
const jsonStr = JSON.parse(str);
console.log('jsonstr', jsonStr)
//console.log('jsonstr', jsonStr)
// 设置增强
vm.setEnhanceConfig(res.cssStr, res.jsStr)
if(jsonStr.chartList)
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl
+40 -23
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1.0.13">
<#assign CACHE_VERSION = "v=1693888295.10">
<!DOCTYPE html>
<html>
<head>
@@ -119,15 +119,18 @@
.ivu-select-dropdown-list .ivu-select-item-focus{
background: none !important;
}
/*列表底部tooltip字体大小*/
.tooltip-footer-font-size .ivu-tooltip-inner{
font-size: 12px;
}
.tooltip-footer-font-size{
font-size: 12px;
}
</style>
<!--引入自定义组件-->
<#include "./template/list.ftl">
<div id="app" style="padding-left: 30px">
<div class="layout" style="margin-left: -30px;margin-top: -10px;">
<#-- <div style="background-color: #1890FF;height: 47px">-->
<#-- <span class="aui-logo"></span>-->
<#-- <span class="jimu-header">欢迎进入积木报表工作台 </span>-->
<#-- </div>-->
<Layout>
<Sider breakpoint="md" collapsible :collapsed-width="78" v-model="isCollapsed">
<i-menu theme="primary" width="auto" :class="menuitemClasses" active-name="datainfo" :open-names="['sub']" @on-select="onMenuSelect">
@@ -152,7 +155,7 @@
<tab-pane icon="md-desktop" label="报表设计" name="name1" class="jimu-tab">
<div style="display: flex;justify-content:space-between;margin-left:16px;margin-right: 38px;">
<div>
<i-input size="small" v-model="name" @keyup.enter.native="enterSearchClick" placeholder="回车搜索报表名称"></i-input>
<i-input size="small" v-model="name" @keyup.enter.native="enterSearchClick" placeholder="搜索报表名称"></i-input>
</div>
<div class="page">
<Page :total="page.total"
@@ -204,25 +207,32 @@
<!-- 底部 &ndash;&gt;-->
<div class="item-footer">
<span class="item-name">{{ item.name }}</span>
<Tooltip :content="item.name" placement="top-start" :transfer="true">
<template slot="content">
<span class="tooltip-footer-font-size">{{item.name}}</span>
</template>
<div class="item-name">
{{ item.name }}
</div>
</Tooltip>
<div>
<a class="opt-show" :href="getExcelViewUrl(item)" target="_blank">
<Tooltip content="预览模板" placement="top">
<Tooltip content="预览模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-eye-outline" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-show" v-show="userMessage" @click="setTemplate(item,1)">
<Tooltip content="收藏模板" placement="top">
<Tooltip content="收藏模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-star-outline" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-show" @click="handleDelete(item)">
<Tooltip content="删除模板" placement="top">
<Tooltip content="删除模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-trash" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-show" @click="handleCopy(item)">
<Tooltip content="复制模板" placement="top">
<Tooltip content="复制模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-browsers" style="font-size: 16px"></i>
</Tooltip>
</a>
@@ -280,7 +290,7 @@
<tab-pane icon="md-options" label="模板案例" name="name2" class="jimu-tab">
<div style="display: flex;justify-content:space-between;margin-left:16px;margin-right: 38px">
<div>
<i-input size="small" v-model="name" @keyup.enter.native="loadData" placeholder="回车搜索报表名称"></i-input>
<i-input size="small" v-model="name" @keyup.enter.native="loadData" placeholder="搜索报表名称"></i-input>
</div>
<div class="page">
<Page :total="page.total"
@@ -326,20 +336,27 @@
<!-- 底部 &ndash;&gt;-->
<div class="item-footer">
<span class="item-name">{{ item.name }}</span>
<Tooltip placement="top-start" transfer>
<template slot="content">
<span class="tooltip-footer-font-size">{{item.name}}</span>
</template>
<div class="item-name">
{{ item.name }}
</div>
</Tooltip>
<div style="margin-left: 14%;">
<a class="opt-show" :href="getExcelViewUrl(item)" target="_blank">
<Tooltip content="预览模板" placement="top">
<Tooltip content="预览模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-eye-outline" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-show" v-show="userMessage" @click="setTemplate(item,0)">
<Tooltip content="取消收藏" placement="top">
<Tooltip content="取消收藏" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-star" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-show" @click="handleCopy(item)">
<Tooltip content="复制模板" placement="top">
<Tooltip content="复制模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-browsers" style="font-size: 16px"></i>
</Tooltip>
</a>
@@ -354,7 +371,7 @@
:on-format-error="handleFormatError"
:on-exceeded-size="handleMaxSize"
:on-success="handleSuccess">
<Tooltip content="上传封面" placement="top-end">
<Tooltip content="上传封面" placement="top-end" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-md-image" style="font-size: 16px"></i>
</Tooltip>
</Upload>
@@ -370,22 +387,22 @@
<i-table size="small" style="margin-top: 10px" border :columns="listColumns" :data="dataSource">
<template slot-scope="{ row, index }" slot="action">
<a class="opt-list-show" :href="getExcelEditUrl(row)" target="_blank">
<Tooltip transfer="true" content="编辑" placement="top">
<Tooltip transfer="true" content="编辑" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-md-create" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-list-show" :href="getExcelViewUrl(row)" target="_blank">
<Tooltip transfer="true" content="预览模板" placement="top">
<Tooltip transfer="true" content="预览模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-eye-outline" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-list-show" v-show="userMessage" @click="setTemplate(row,0)">
<Tooltip transfer="true" content="取消收藏" placement="top">
<Tooltip transfer="true" content="取消收藏" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-star" style="font-size: 16px"></i>
</Tooltip>
</a>
<a class="opt-list-show" @click="handleCopy(row)">
<Tooltip transfer="true" content="复制模板" placement="top">
<Tooltip transfer="true" content="复制模板" placement="top" class="tooltip-footer-font-size">
<i class="ivu-icon ivu-icon-ios-browsers" style="font-size: 16px"></i>
</Tooltip>
</a>
@@ -484,7 +501,7 @@
},
mounted:function(){
this.token = token;
console.log("list_mount--------------",this.token);
//console.log("list_mount--------------",this.token);
this.uploadHeader = {"X-Access-Token":this.token};
this.actionUrl=BASE_URL+"/jmreport/putFile";
this.$nextTick(()=>{
@@ -640,7 +657,7 @@
},this);
},
handlerViewExcel: function(item){
console.log(item)
//console.log(item)
},
getExcelEditUrl: function(item){
//update-begin---author:wangshuai ---date:20220215 for：[issues/I4SOSH]做完的积木报表，预览生成的访问地址，默认都加了token=null------------
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl
+2 -2
View File
@@ -51,7 +51,7 @@
<p slot="header">
<span>添加图表
<Tooltip :transfer="true" content="图表文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/1605007" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/chart.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</p>
@@ -94,7 +94,7 @@
<p slot="header">
<span>添加表达式
<Tooltip :transfer="true" content="表达式文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2332213" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/function.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
<Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-if="functionScreen" :transfer="true" content="缩小" placement="top">
<Icon type="ios-contract" @click="functionScreenClick"/>
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
+1 -1
View File
@@ -362,7 +362,7 @@
},
// 参数选中改变事件
handleClParamSelected(selections){
console.log('selections', selections)
//console.log('selections', selections)
let arr = []
selections.map(k=>{
arr.push(k.index)
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
+2 -2
View File
@@ -473,7 +473,7 @@
if (that.dictItemModel.status ==undefined) {
that.dictItemModel.status = 1
}
console.log(that.dictItemModel);
//console.log(that.dictItemModel);
$http.post({
url: url,
contentType: 'json',
@@ -590,7 +590,7 @@
},
//字典详情编辑
editItemDict(row) {
console.log(row)
//console.log(row)
this.dictItemTitle = "修改"
this.dictItemModel = row
this.createDictItemShow = true
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
+34 -14
View File
@@ -61,7 +61,7 @@
</i-select>
<i-button size="small" @click="sourceManage" v-if="sqlForm.dbType == 0" type="primary">维护</i-button>
<Tooltip :transfer="true" content="数据源维护文档" placement="top" class="jimu-tooltip">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2084137" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/dbsource.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</div>
<i-input size="small" style="margin-top: 10px" search enter-button v-model="tableName" placeholder="表名查询" @on-search="queryTableName" />
@@ -110,7 +110,7 @@
<#--<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;margin-left: -86px">是否分页
<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>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/paging.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</Checkbox>
</form-item>
@@ -139,7 +139,7 @@
<li>您可以编写${'#'}${'{sysUserCode}'} 做为一个系统变量,这里sysUserCode是当前登录人。例如:select * from table where create_by=${"'#"}${"{sysUserCode}'"}。</li>
<li>您可以编写存储过程CALL proc_sys_role(${'$'}${'{'}${'pageNo'}${"}"}, ${'$'}${'{'}${'pageSize'}${"}"}),CALL为开启存储过程。
<Tooltip content="数据源用法文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2384069" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dsUse.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</li>
</ul>
@@ -154,9 +154,9 @@
<ul>
<li>如果id字段为字符串类型则需要加单引号:http://127.0.0.1:8080/jeecg-boot/jimureport/test?id=${"$"}${"{id}"}。</li>
<li>您可以编写${"#"}${"{sysDateTime}"}做为一个系统变量,这里sysDateTime是当前系统时间。例如:http://127.0.0.1:8080/jeecg-boot/jimureport/test?riqi=${"#"}${"{sysDateTime}"}。</li>
<li>您可以简写访问路径，如：{ { domainURL } }/jimureport/test。
<li>您可以简写访问路径，如：${"#"}${"{domainURL}"}/jimureport/test/getList
<Tooltip content="数据源用法文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2384069" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dsUse.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</li>
</ul>
@@ -167,17 +167,17 @@
<i-input v-model="sqlForm.jsonData" type="textarea" :rows="4" placeholder="请输入JSON数据" style="min-height: 120px;max-height: 620px;width:950px">
</i-input>
</form-item>
<i-button @click="handleSQLAnalyze" v-if="sqlForm.dbType == 0" type="primary">SQL解析</i-button>
<i-button @click="handleAnalyze('sql')" v-if="sqlForm.dbType == 0" type="primary">SQL解析</i-button>
<Tooltip v-if="sqlForm.dbType == 0" :transfer="true" content="SQL解析文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020087" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/sql.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
<i-button @click="handleApiAnalyze" v-if="sqlForm.dbType == 1" type="primary">Api解析</i-button>
<i-button @click="handleAnalyze('api')" v-if="sqlForm.dbType == 1" type="primary">Api解析</i-button>
<Tooltip v-if="sqlForm.dbType == 1" :transfer="true" content="Api解析文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020177" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/api.html" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
<i-button @click="handleJsonAnalyze" v-if="sqlForm.dbType == 3" type="primary">JSON解析</i-button>
<i-button @click="handleAnalyze('json')" v-if="sqlForm.dbType == 3" type="primary">JSON解析</i-button>
<Tooltip v-if="sqlForm.dbType == 3" :transfer="true" content="JSON解析文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2290859" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dataSet/json.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</i-col>
</Row>
@@ -1512,7 +1512,6 @@
results.searchFlag = 0
}
results.orderNum = i
results.extJson=""
newData.push(results);
i++;
}
@@ -1598,7 +1597,7 @@
if(result && result.length>0){
Vue.prototype.$Message.success("解析成功！");
}else{
Vue.prototype.$Message.warning("数据为空，报表字段明细会被清空！");
Vue.prototype.$Message.warning("执行成功，但是数据为空，无法解析报表字段！！");
}
//update-end--Author:wangshuai--Date:20211109--for:api解析为空提示
//update-begin--Author:wangshuai Date:20210430 for：api动态报表配置明细如果字段存在就不替换，否则替换，要不然会引起数据清空--------------------
@@ -1633,7 +1632,6 @@
results.searchFlag = 0
}
results.orderNum = i
results.extJson = ""
newData.push(results);
i++;
}
@@ -2353,6 +2351,28 @@
this.tab2.data[this.tableIndex].extJson = this.paramConfigData
}
this.extJsonCancel();
},
/**
* 是否需要更新字段
*/
handleAnalyze(value) {
let that = this;
this.$Modal.confirm({
title:'是否要重置字段?',
content: '已存在的字段不会修改，但是数据为空会删除所有字段！',
onOk: () => {
if(value == 'sql'){
that.handleSQLAnalyze();
}else if(value == 'api'){
that.handleApiAnalyze();
}else if(value == 'json'){
that.handleJsonAnalyze();
}
},
onCancel: () => {
console.info("不重置字段")
}
});
}
}
})
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
+9 -9
View File
@@ -1083,15 +1083,15 @@
},
data(){
return {
url:["http://report.jeecg.com/2332214",
"http://report.jeecg.com/2332216",
"http://report.jeecg.com/2332217",
"http://report.jeecg.com/2332218",
"http://report.jeecg.com/2332219",
"http://report.jeecg.com/2332221",
"http://report.jeecg.com/2358337",
"http://report.jeecg.com/2361961",
"http://report.jeecg.com/2365251"]
url:["https://help.jeecg.com/jimureport/function/cell.html",
"https://help.jeecg.com/jimureport/function/condition.html",
"https://help.jeecg.com/jimureport/function/date.html",
"https://help.jeecg.com/jimureport/function/math.html",
"https://help.jeecg.com/jimureport/function/characterString.html",
"https://help.jeecg.com/jimureport/function/colour.html",
"https://help.jeecg.com/jimureport/function/library.html",
"https://help.jeecg.com/jimureport/function/determine.html",
"https://help.jeecg.com/jimureport/function/tongji.html"]
}
},
methods: {
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
+19 -3
View File
@@ -37,7 +37,7 @@
<form-item prop="isPage" style="display: flex">
<Checkbox v-if="formData.isList == true" v-model="formData.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>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/base/paging.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</Checkbox>
</form-item>
@@ -56,9 +56,9 @@
<form-item prop="javaValue" label="值：">
<i-input v-model="formData.javaValue" type="text" style="width: 400px" placeholder="请填入对应的值"/>
</form-item>
<i-button @click="analyze" type="primary">解 析</i-button>
<i-button @click="handelAnalyze" type="primary">解 析</i-button>
<Tooltip :transfer="true" content="javabean解析文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/2220323" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/dataSet/java.html" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</i-col>
</Row>
@@ -686,6 +686,22 @@
return true
}
},
/**
* 解析之前提示是否重置字段
*/
handelAnalyze(){
let that = this;
this.$Modal.confirm({
title:'是否要重置字段?',
content: '已存在的字段不会修改，但是数据为空会删除所有字段！',
onOk: () => {
that.analyze();
},
onCancel: () => {
console.info("不重置字段")
}
});
},
analyze(){
let { javaType, javaValue, isPage } = this.formData
let param = {}
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
+1 -1
View File
@@ -4,7 +4,7 @@
<p slot="header">
<span>打印设置
<Tooltip :transfer="true" content="打印文档" placement="top">
<a class="jimu-table-tip help-color" href="http://report.jeecg.com/1605005" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
<a class="jimu-table-tip help-color" href="https://help.jeecg.com/jimureport/print.html" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
</Tooltip>
</span>
</p>
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
+1 -1
View File
@@ -128,7 +128,7 @@
if(type === 'pie' || type === 'funnel' || type === 'scatter' || type === 'graph'){
//如果是选中数值状态
if(this.izShowNumber){
this.seriesOption.formatter="{b}\n{c}"
this.seriesOption.formatter="{b}:{c}"
}else{
this.seriesOption.formatter="{b}"
}
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
+3 -3
View File
@@ -167,7 +167,7 @@
$http.metaGet(this.url).then((res) => {
this.combineTreeData(res.data)
}).catch(function (error){
console.log('加载树错误', error)
console.error('加载树错误', error)
});
},
initTreeSelected(){
@@ -345,10 +345,10 @@
}
},
selectChange (obj) {
console.log('selectChange', obj)
//console.log('selectChange', obj)
},
treeCheckChange(arr){
console.log('treeCheckChange', arr)
//console.log('treeCheckChange', arr)
this.multipleShowVal = []
this.multipleHideVal = []
for (let i = 0; i < arr.length; i++) {
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl
+75 -72
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1.0.13">
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign config_id = "${id!''}">
<#assign shareView = "${shareView}">
<!DOCTYPE html>
@@ -163,85 +163,88 @@ function getLocalRequestUrl() {
<span style="color: #000000;" title="点击展开显示查询信息">查 询 栏</span>
<div slot="content">
<i-form ref="queryForm" :model="queryInfo" inline :label-width="100" class="jm-query-form" @keydown.native.enter.prevent="doReportQuery">
<template v-for="(item, index) in configQueryList">
<form-item :label="getQueryItemLabel(item)" :index="index">
<Row>
<i-col :span="6" v-for="(item, index) in configQueryList" :key="index">
<form-item style="margin-bottom: 12px !important;" :label="getQueryItemLabel(item)" :index="index">
<!-- 日期选择器 yyyy-MM-dd HH:mm:ss -->
<template v-if="item.type=='date'">
<Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
<i-col span="11">
<date-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" class="jm-select-box" :placeholder="'请选择起始值'"></date-picker>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<date-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" class="jm-select-box" :placeholder="'请选择结束值'"></date-picker>
</i-col>
</Row>
<date-picker v-else :ref="item.key" :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></date-picker>
</template>
<!-- 日期选择器 yyyy-MM-dd HH:mm:ss -->
<template v-if="item.type=='date'">
<Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
<i-col span="11">
<date-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" :placeholder="'请选择起始值'"></date-picker>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<date-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" :placeholder="'请选择结束值'"></date-picker>
</i-col>
</Row>
<date-picker v-else :ref="item.key" :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></date-picker>
</template>
<!-- 时间选择器 HH:mm:ss -->
<template v-else-if="item.type=='time'">
<Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
<i-col span="11">
<time-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" class="jm-select-box" :placeholder="'请选择起始值'"></time-picker>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<time-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" class="jm-select-box" :placeholder="'请选择结束值'"></time-picker>
</i-col>
</Row>
<time-picker :ref="item.key" :time-picker-options="{disabledHours:true}" v-else :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></time-picker>
</template>
<!-- 时间选择器 HH:mm:ss -->
<template v-else-if="item.type=='time'">
<Row v-if="item.mode==2" :class="'jmreport-query-'+item.realType">
<i-col span="11">
<time-picker :ref="item.key+'_begin'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_begin')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_begin']" :placeholder="'请选择起始值'"></time-picker>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<time-picker :ref="item.key+'_end'" @on-change="(str)=>handleQueryDateChange(str, item.key+'_end')" :type="item.realType" :format="item.format" :transfer="true" v-model="queryInfo['onlyshow_'+item.key+'_end']" :placeholder="'请选择结束值'"></time-picker>
</i-col>
</Row>
<time-picker :ref="item.key" :time-picker-options="{disabledHours:true}" v-else :type="item.realType" class="jm-select-box" :transfer="true" :format="item.format" :class="'jmreport-query-'+item.type" v-model="queryInfo['onlyshow_'+item.key]" @on-change="(str)=>handleQueryDateChange(str, item.key)" :placeholder="'请选择'+item.title"></time-picker>
</template>
<!-- 下拉树 -->
<template v-else-if="item.mode==6">
<j-tree-select :ref="item.key" :url="item.loadTree" :loadtreeurl="item.loadTreeByValue" v-model="queryInfo[item.key]"></j-tree-select>
</template>
<!-- 下拉树 -->
<template v-else-if="item.mode==6">
<j-tree-select :ref="item.key" :url="item.loadTree" :loadtreeurl="item.loadTreeByValue" v-model="queryInfo[item.key]"></j-tree-select>
</template>
<!-- 自定义下拉框 -->
<template v-else-if="item.mode==7">
<i-select :ref="item.key" class="jm-select-box" clearable :transfer="true" v-model="queryInfo[item.key]" :placeholder="'请选择'+item.title">
<i-option v-for="(dict, dIndex) in item.dictList" :key="dIndex" :index="index" :value="dict.value">{{ dict.text }}</i-option>
</i-select>
</template>
<!-- 自定义下拉框 -->
<template v-else-if="item.mode==7">
<i-select :ref="item.key" class="jm-select-box" clearable :transfer="true" v-model="queryInfo[item.key]" :placeholder="'请选择'+item.title">
<i-option v-for="(dict, dIndex) in item.dictList" :key="dIndex" :index="index" :value="dict.value">{{ dict.text }}</i-option>
</i-select>
</template>
<template v-else>
<template v-if="item.dictList && item.dictList.length>0 && (item.mode==4 ||item.mode==3)">
<!-- 多选 -->
<j-select-scroll-multiple v-if="item.mode==3" v-model="queryInfo['onlyshow_'+item.key]" :item="JSON.stringify(item)" @dictmultipleok="handleDictMultipleOk" :index="index"></j-select-scroll-multiple>
<template v-else>
<template v-if="item.dictList && item.dictList.length>0 && (item.mode==4 ||item.mode==3)">
<!-- 多选 -->
<j-select-scroll-multiple v-if="item.mode==3" v-model="queryInfo['onlyshow_'+item.key]" :item="JSON.stringify(item)" @dictmultipleok="handleDictMultipleOk" :index="index"></j-select-scroll-multiple>
<!-- 单选 -->
<j-select-scroll-radio v-if="item.mode==4" v-model="queryInfo[item.key]" :item="JSON.stringify(item)" @dictok="handleDictOk"></j-select-scroll-radio>
</template>
<!-- 单选 -->
<j-select-scroll-radio v-if="item.mode==4" v-model="queryInfo[item.key]" :item="JSON.stringify(item)" @dictok="handleDictOk"></j-select-scroll-radio>
</template>
<!-- 数值查询 -->
<template v-else-if="item.type=='number'">
<Row v-if="item.mode==2">
<i-col span="11">
<i-input :ref="item.key+'_begin'" class="jm-select-box" v-model="queryInfo[item.key+'_begin']" type="number" :placeholder="'请输入起始值'" clearable></i-input>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<i-input :ref="item.key+'_end'" class="jm-select-box" v-model="queryInfo[item.key+'_end']" type="number" :placeholder="'请输入结束值'" clearable></i-input>
</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>
</template>
<!-- 数值查询 -->
<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>
</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>
</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>
</template>
<!-- 默认输入框 模糊查询参数加* -->
<template v-else>
<i-input v-if="item.mode==5" :ref="item.key" @on-change="(e)=>handleLikeQueryChange(e, item.key)" class="jm-select-box" v-model="queryInfo['onlyshow_'+item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
<i-input v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
</template>
</template>
</form-item>
</template>
<form-item class="jm-search-btns">
<i-button type="primary" icon="ios-search-outline" @click="doReportQuery">查询</i-button>
<i-button style="margin-left: 8px" icon="ios-redo-outline" @click="resetReportQuery">重置</i-button>
</form-item>
<!-- 默认输入框 模糊查询参数加* -->
<template v-else>
<i-input v-if="item.mode==5" :ref="item.key" @on-change="(e)=>handleLikeQueryChange(e, item.key)" class="jm-select-box" v-model="queryInfo['onlyshow_'+item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
<i-input v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
</template>
</template>
</form-item>
</i-col>
<i-col :span="6">
<form-item class="jm-search-btns">
<i-button type="primary" icon="ios-search-outline" @click="doReportQuery">查询</i-button>
<i-button style="margin-left: 8px" icon="ios-redo-outline" @click="resetReportQuery">重置</i-button>
</form-item>
</i-col>
</Row>
</i-form>
</div>
pom.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<jasypt.version>3.0.5</jasypt.version>
<ttl.version>2.12.6</ttl.version>
<jaxb.version>2.3.5</jaxb.version>
<jimu.version>1.5.6</jimu.version>
<jimu.version>1.6.2-beta</jimu.version>
<aws.version>1.11.543</aws.version>
<xxl.job.version>2.4.0</xxl.job.version>
<activiti.version>5.22.0</activiti.version>