From 7f46d9791beccf69d661450f0fa0b9140294a48c Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 30 Jan 2024 20:46:22 +0800 Subject: [PATCH] :arrow_up: Upgrading dependencies. up jimu springboot3 --- db/6pigxx_config.sql | 2 +- pigx-visual/pigx-jimu-platform/pom.xml | 51 +- .../jmreport/desreport/authority.ftl | 43 - .../jmreport/desreport/common/resource.ftl | 14 - .../jmreport/desreport/common/tj.ftl | 17 - .../templates/jmreport/desreport/demo.ftl | 835 ------ .../templates/jmreport/desreport/error.ftl | 15 - .../templates/jmreport/desreport/index.ftl | 1360 ---------- .../templates/jmreport/desreport/list.ftl | 12 +- .../templates/jmreport/desreport/modal.ftl | 172 -- .../templates/jmreport/desreport/print.ftl | 33 - .../components/background_setting.ftl | 131 - .../components/bar_series_setting.ftl | 75 - .../template/components/bar_setting.ftl | 87 - .../desreport/template/components/barcode.ftl | 208 -- .../template/components/cell_linkage.ftl | 404 --- .../components/central_point_setting.ftl | 60 - .../template/components/chart_linkage.ftl | 375 --- .../template/components/data_dictionary.ftl | 771 ------ .../components/data_source_setting.ftl | 2391 ----------------- .../components/function_interpretation.ftl | 1103 -------- .../template/components/funnel_setting.ftl | 87 - .../template/components/gauge_setting.ftl | 145 - .../template/components/grid_setting.ftl | 66 - .../template/components/hyperlinks.ftl | 567 ---- .../template/components/javabean_setting.ftl | 1194 -------- .../template/components/jurisdiction.ftl | 187 -- .../template/components/legend_setting.ftl | 114 - .../template/components/line_setting.ftl | 108 - .../template/components/map_setting.ftl | 538 ---- .../template/components/margin_setting.ftl | 96 - .../template/components/match_setting.ftl | 376 --- .../template/components/pictorial_setting.ftl | 146 - .../template/components/pie_setting.ftl | 91 - .../components/primary_sub_report.ftl | 312 --- .../template/components/print_setting.ftl | 349 --- .../desreport/template/components/qrcode.ftl | 88 - .../template/components/radar_setting.ftl | 73 - .../template/components/scatter_setting.ftl | 68 - .../template/components/select_input.ftl | 105 - .../components/select_scroll_multiple.ftl | 496 ---- .../components/select_scroll_radio.ftl | 320 --- .../template/components/series_setting.ftl | 149 - .../components/sql_function_replace.ftl | 176 -- .../template/components/title_setting.ftl | 103 - .../template/components/tooltip_setting.ftl | 86 - .../template/components/tree_select.ftl | 424 --- .../template/components/view_setting.ftl | 208 -- .../template/components/xAxis_setting.ftl | 127 - .../template/components/yAxis_setting.ftl | 161 -- .../jmreport/desreport/template/index.ftl | 35 - .../jmreport/desreport/template/list.ftl | 1 - .../jmreport/desreport/template/view.ftl | 2 - .../templates/jmreport/desreport/view.ftl | 308 --- pom.xml | 2 +- 55 files changed, 13 insertions(+), 15454 deletions(-) delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl delete mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql index 9c12940ad..52136191f 100644 --- a/db/6pigxx_config.sql +++ b/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 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 (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', '2024-01-30 20:44:36', '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', '', ''); diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml index 838e035bf..0cb92daca 100755 --- a/pigx-visual/pigx-jimu-platform/pom.xml +++ b/pigx-visual/pigx-jimu-platform/pom.xml @@ -12,13 +12,7 @@ jar 积木报表系统 - - 1.2.20 - 2.7.18 - 2021.0.8 - 2021.0.5.0 - 2.7.11 - + @@ -58,14 +52,13 @@ org.jeecgframework.jimureport - jimureport-spring-boot-starter + jimureport-spring-boot3-starter ${jimu.version} com.alibaba - druid-spring-boot-starter - ${druid.version} + druid-spring-boot-3-starter @@ -84,44 +77,6 @@ - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-dependencies.version} - pom - import - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl deleted file mode 100644 index 86eb3ee81..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl +++ /dev/null @@ -1,43 +0,0 @@ -<#assign CACHE_VERSION = "v=1699715555.10"> - - - - - - 没有权限 - - - -
-
- -
-
- 您没有权限访问该页面 -
-
- - diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl deleted file mode 100644 index 23c2b00b2..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/resource.ftl +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl deleted file mode 100644 index 58e8cd72c..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl deleted file mode 100644 index ca1f05d1c..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl +++ /dev/null @@ -1,835 +0,0 @@ - - - - - - 积木报表设计器 - - - - - - - - -
- - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl deleted file mode 100644 index 32347c969..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - 系统错误 - - - -
- ${message} - Upgrade Now -
- - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl deleted file mode 100644 index b23847d50..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl +++ /dev/null @@ -1,1360 +0,0 @@ -<#assign CACHE_VERSION = "v=1699715555.10"> -<#assign config_id = "${id!''}"> - - - - - - 积木报表—免费可视化Web报表工具 - - - - <#include "./common/resource.ftl"> - - - - - - - - - - - - <#include "./template/index.ftl"> - - -
- - -
Loading
- -<#include "./modal.ftl"> -
-
-
- - 收起 - - - - - - - - -
-
- -
-
- -
-
-
- -
-
-
-
- - 收起 - - - - - - -
-
-
- 坐标 - -
-
- 类型 -<#--

自定义表单式

--> - - 文本 - 数值 - 图片 - 条形码 - 二维码 - 富文本 - <#--图表--> - -
-
- 尺寸 - - 完全覆盖(cover) - 适应内容(contain) - width100%--center - height100%--center - 居中显示 - 拉伸(100% 100%) - -
- -
- 值 - -
- -
- 宽度 - -
- -
- 高度 - -
- - - - - -
-
- 启用 -
-
- 数据行倍数： - -
-
- - -
- - - - -
-
- 聚合方式 - - {{ item.label }} - -
-
- 扩展方向 - - {{ item.label }} - -
-
- 排序方式 - - {{ item.label }} - -
-
- 自定义文本排序 - -
-
- 高级配置 - - {{ item.label }} - -
-
- - - - - -
- 分组依据 - - {{ item.label }} - -
- -
- 聚合方式 - - {{ item.label }} - -
- -
- - - - - - 添加链接 - - - - - - 图表联动 - 报表钻取 - 网络报表 - - - - - - - - - - - - - -
- 小数位数 - -
-
- 增强配置 -
- - - - - 新增 - - - - - - -
- 横向偏移(px)： - -
- -
- 纵向偏移(px)： - -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#----> - - - - - -
- 数据类型 - - SQL数据集 - Api数据集 - JSON数据集 - JavaBean数据集 - -
- - -
-
- Api类型 - - 静态数据 - 动态数据 - 接口请求 - -
-
- 请自定义数据值: - 编辑 -
-
-

接口url:  

- -
-
-
- 绑定数据集: - - {{ item.title }} - -
-
-
- - -
-
- 绑定数据集: - - {{ item.title }} - -
-
- 分类属性: - - {{ item.fieldText }} - -
-
- 值属性: - - {{ item.fieldText }} - -
- - - -
- - -
-
- 绑定数据集: - - {{ item.title }} - -
-
- - -
-
- 绑定数据集: - - {{ item.title }} - -
-
- -
-

系列类型:

-
- - 新增 - - -
-
- - - 运行 - - - - -
- 图片： - -
- -
- -
-
- 上传 - - -
-
- 图片宽度: - -
-
- 图片高度: - -
-
- -
- 重复设置: - - 无重复 - 水平重复 - 垂直重复 - 双向重复 - -
- - 取消背景图 - -
- 表格边框: - - 显示 - 隐藏 - -
- -
- - - - - - - - - - - - - - -
-
-
- - - - -
- - - - - - - -<#include "./common/tj.ftl"> - - diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl index 95cea3b7a..763689f40 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl @@ -131,10 +131,6 @@ <#include "./template/list.ftl">
-<#--
--> -<#-- --> -<#-- 欢迎进入积木报表工作台 --> -<#--
--> @@ -147,6 +143,10 @@ 数据报表 +<#-- --> +<#-- --> +<#-- 图形报表--> +<#-- --> 打印设计 @@ -589,6 +589,10 @@ that.tabpan = name; that.page={page: 1,size: 10,total: 0,}; } + //查询报表名称加trim + if(that.name){ + that.name = that.name.trim(); + } var url = ""; that.dataSource=[]; if (that.tabpan == "name1"){ diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl deleted file mode 100644 index 624ab1dce..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/modal.ftl +++ /dev/null @@ -1,172 +0,0 @@ - diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl deleted file mode 100644 index 5355c0acf..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/print.ftl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - 打印页面 - - - - - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl deleted file mode 100644 index 5d20c4df9..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl +++ /dev/null @@ -1,131 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl deleted file mode 100644 index 0e01319e5..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl +++ /dev/null @@ -1,75 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl deleted file mode 100644 index 1553b9851..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl +++ /dev/null @@ -1,87 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl deleted file mode 100644 index 7a875cee1..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl +++ /dev/null @@ -1,208 +0,0 @@ - -<#--JsBarcode("#imgcode", "123", { -format: "CODE39",//选择要使用的条形码类型 -width:3,//设置条之间的宽度 -height:100,//高度 -displayValue:true,//是否在条形码下方显示文字 -text:"456",//覆盖显示的文本 -fontOptions:"bold italic",//使文字加粗体或变斜体 -font:"fantasy",//设置文本的字体 -textAlign:"left",//设置文本的水平对齐方式 -textPosition:"top",//设置文本的垂直位置 -textMargin:5,//设置条形码和文本之间的间距 -fontSize:15,//设置文本的大小 -background:"#eee",//设置条形码的背景 -lineColor:"#2196f3",//设置条和文本的颜色。 -margin:15//设置条形码周围的空白边距--> - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl deleted file mode 100644 index 931fcb37e..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl +++ /dev/null @@ -1,404 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl deleted file mode 100644 index d4d358e04..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl +++ /dev/null @@ -1,60 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl deleted file mode 100644 index 1d4a8fdbb..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl +++ /dev/null @@ -1,375 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl deleted file mode 100644 index 9d4f13d65..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl +++ /dev/null @@ -1,771 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl deleted file mode 100644 index 5b0074b12..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl +++ /dev/null @@ -1,2391 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl deleted file mode 100644 index 83f9540a5..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl +++ /dev/null @@ -1,1103 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl deleted file mode 100644 index 0a5c6ca0f..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl +++ /dev/null @@ -1,87 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl deleted file mode 100644 index 5c4f8d6c7..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl +++ /dev/null @@ -1,145 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl deleted file mode 100644 index 341e0b347..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl +++ /dev/null @@ -1,66 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl deleted file mode 100644 index 4a13bb17e..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl +++ /dev/null @@ -1,567 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl deleted file mode 100644 index 83f44c0d3..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl +++ /dev/null @@ -1,1194 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl deleted file mode 100644 index 1ffd0a65d..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl +++ /dev/null @@ -1,187 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl deleted file mode 100644 index 24f7f1106..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl +++ /dev/null @@ -1,114 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl deleted file mode 100644 index 0001c2340..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl +++ /dev/null @@ -1,108 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl deleted file mode 100644 index a2f1f5aa6..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl +++ /dev/null @@ -1,538 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl deleted file mode 100644 index 11142d550..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl +++ /dev/null @@ -1,96 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl deleted file mode 100644 index 834020346..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl +++ /dev/null @@ -1,376 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl deleted file mode 100644 index 3dafc426a..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl +++ /dev/null @@ -1,146 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl deleted file mode 100644 index 4e8edb52d..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl +++ /dev/null @@ -1,91 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl deleted file mode 100644 index c31b9e1d4..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl +++ /dev/null @@ -1,312 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl deleted file mode 100644 index f765642ed..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl +++ /dev/null @@ -1,349 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl deleted file mode 100644 index e13a7a911..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl +++ /dev/null @@ -1,88 +0,0 @@ -<#--width: 150, -height: 150, // 高度 -text: this.qrcode // 二维码内容 -// render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas） -// background: '#f0f' -// foreground: '#ff0'--> - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl deleted file mode 100644 index 0483373e9..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl +++ /dev/null @@ -1,73 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl deleted file mode 100644 index 46536e5d3..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl +++ /dev/null @@ -1,68 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl deleted file mode 100644 index f383833af..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl +++ /dev/null @@ -1,105 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl deleted file mode 100644 index 526ef6dd3..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl +++ /dev/null @@ -1,496 +0,0 @@ -<#--多选组件，用于远程搜索查询 -item:传递的参数，包含字典code，查询key -value:view组件传递的值 v-model -index:下标--> - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl deleted file mode 100644 index f27488770..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl +++ /dev/null @@ -1,320 +0,0 @@ -<#--单选组件，用于远程搜索查询 -item:传递的参数，包含字典code，查询key -value:view组件传递的值 v-model--> - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl deleted file mode 100644 index 17ad9b81d..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl +++ /dev/null @@ -1,149 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl deleted file mode 100644 index e14e86045..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl +++ /dev/null @@ -1,176 +0,0 @@ - - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl deleted file mode 100644 index 66ddcfcb4..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl +++ /dev/null @@ -1,103 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl deleted file mode 100644 index 6e104eb91..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl +++ /dev/null @@ -1,86 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl deleted file mode 100644 index 45f1892ea..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl +++ /dev/null @@ -1,424 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl deleted file mode 100644 index c5bce2f6d..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl +++ /dev/null @@ -1,208 +0,0 @@ - - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl deleted file mode 100644 index d56cfb166..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl +++ /dev/null @@ -1,127 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl deleted file mode 100644 index 2a5f5c286..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl +++ /dev/null @@ -1,161 +0,0 @@ - - \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl deleted file mode 100644 index b6011f7f4..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl +++ /dev/null @@ -1,35 +0,0 @@ -<#include "components/select_input.ftl"> -<#include "components/barcode.ftl"> -<#include "components/qrcode.ftl"> -<#include "components/title_setting.ftl"> -<#include "components/bar_setting.ftl"> -<#include "components/line_setting.ftl"> -<#include "components/pie_setting.ftl"> -<#include "components/margin_setting.ftl"> -<#include "components/funnel_setting.ftl"> -<#include "components/pictorial_setting.ftl"> -<#include "components/scatter_setting.ftl"> -<#include "components/map_setting.ftl"> -<#include "components/radar_setting.ftl"> -<#include "components/gauge_setting.ftl"> -<#include "components/xAxis_setting.ftl"> -<#include "components/yAxis_setting.ftl"> -<#include "components/series_setting.ftl"> -<#include "components/tooltip_setting.ftl"> -<#include "components/grid_setting.ftl"> -<#include "components/legend_setting.ftl"> -<#include "components/background_setting.ftl"> -<#include "components/match_setting.ftl"> -<#include "components/data_source_setting.ftl"> -<#include "components/javabean_setting.ftl"> -<#include "components/central_point_setting.ftl"> -<#include "components/function_interpretation.ftl"> -<#include "components/data_dictionary.ftl"> -<#include "components/hyperlinks.ftl"> -<#include "components/print_setting.ftl"> -<#include "components/view_setting.ftl"> -<#include "components/chart_linkage.ftl"> -<#include "components/cell_linkage.ftl"> -<#include "components/primary_sub_report.ftl"> -<#include "components/sql_function_replace.ftl"> -<#include "components/bar_series_setting.ftl"> \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl deleted file mode 100644 index 3475babdf..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/list.ftl +++ /dev/null @@ -1 +0,0 @@ -<#include "components/jurisdiction.ftl"> \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl deleted file mode 100644 index 360943bba..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl +++ /dev/null @@ -1,2 +0,0 @@ -<#include "components/select_scroll_radio.ftl"> -<#include "components/select_scroll_multiple.ftl"> \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl deleted file mode 100644 index 14a7b5f6b..000000000 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl +++ /dev/null @@ -1,308 +0,0 @@ -<#assign CACHE_VERSION = "v=1699715555.10"> -<#assign config_id = "${id!''}"> -<#assign shareView = "${shareView}"> - - - - - - - - -<#include "./common/resource.ftl"> -<#include "./template/components/tree_select.ftl"> -<#include "./template/view.ftl"> - - - - - - - - - -
- -
- - - 查 询 栏 -
- - - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - - - - - -
- - -
- - <#-- --> -
- - - -
- 确定 -
-
- - - - - -
- - -
- 确定 -
-
- - - - - -
- -
-<#--预览js--> - - - - - - - -<#include "./common/tj.ftl"> - - diff --git a/pom.xml b/pom.xml index b2181a21c..79a160b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 3.0.5 2.12.6 2.3.5 - 1.6.5 + 1.6.6-beta2 1.11.543 2.4.0 5.22.0