Destiny.Lin
7d2f4e7d73
Merge remote-tracking branch 'origin/persist/11.0' into mergeFBP
...
# Conflicts:
# build.gradle
# designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
# designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
# designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
# designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
# designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
# designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
# designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
# designer-base/src/main/java/com/fr/design/utils/TemplateUtils.java
# designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java
# designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
# designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
# designer-realize/src/main/java/com/fr/start/SplashContext.java
# designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java
# designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java
5 months ago
Destiny.Lin-林锦龙
ee7b7ff0ef
Pull request #14266 : REPORT-114392 FR-FBP版本本地设计适配
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '7868f27a79e13a6b83d9db0dd70090e298f96128':
REPORT-114392 FR-FBP版本本地设计适配 去除模板主题中的frm选项
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接预览
5 months ago
Destiny.Lin
7868f27a79
REPORT-114392 FR-FBP版本本地设计适配 去除模板主题中的frm选项
5 months ago
Destiny.Lin
3e7509ebc2
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接预览
5 months ago
Destiny.Lin-林锦龙
885306a51e
Pull request #14265 : REPORT-114392 FR-FBP版本本地设计适配
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit 'e17feb7436565577db77e99c28e8a72fd3672f64':
REPORT-114392 FR-FBP版本本地设计适配 修复国际化
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接保存
REPORT-114392 FR-FBP版本本地设计适配 关闭环境监测
REPORT-127453 frm问题处理
5 months ago
Destiny.Lin
e17feb7436
REPORT-114392 FR-FBP版本本地设计适配 修复国际化
5 months ago
Destiny.Lin
fb04f865d5
Merge remote-tracking branch 'origin/mss/2.0' into mss/2.0
5 months ago
Destiny.Lin
229e00c9a7
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接
5 months ago
Destiny.Lin
ff0cee0c63
REPORT-114392 FR-FBP版本本地设计适配 修复数据连接保存
5 months ago
Levy.Xie-解安森
6689795fef
Pull request #14255 : REPORT-113994 【NewUI】设计器样式翻新-图表
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '462452de1a3dd750797c32d05045364e518b2ad1':
REPORT-113994 【NewUI】设计器样式翻新-图表
5 months ago
Destiny.Lin
cfaeac34c6
REPORT-114392 FR-FBP版本本地设计适配 关闭环境监测
5 months ago
Destiny.Lin
df58ea9ae2
REPORT-127453 frm问题处理
5 months ago
superman
c6467f11cc
Merge pull request #14262 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'd065d0fc1078d3260b2202b8419a1564160707a2':
5 months ago
superman
d065d0fc10
Merge pull request #14256 in DESIGN/design from release/11.0 to final/11.0
...
* commit '18efcac0f2a2091ff305b275c88024b14a3ce7e2':
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
REPORT-125224 fix:补充设计器启动计时器关闭
REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
REPORT-127241 设计器性能埋点字段调整
REPORT-117002 设计器性能埋点监控 调整代码
REPORT-117002 设计器性能埋点监控 调整代码
无jira 打包问题
REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
REPORT-70155 fix: fvs根据主题样式创建默认单元格
REPORT-117002 feat:设计器UI性能监控
REPORT-117002 feat:设计器UI性能监控
5 months ago
Levy.Xie-解安森
462452de1a
REPORT-113994 【NewUI】设计器样式翻新-图表
5 months ago
Destiny.Lin-林锦龙
1656a13e4c
Pull request #14254 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复序列化问题
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '7fddad6d14552ff39b12194efdbf7086c208f1b5':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复序列化问题
5 months ago
Destiny.Lin
7fddad6d14
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复序列化问题
5 months ago
Destiny.Lin-林锦龙
ad2491d232
Pull request #14253 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复部分bug
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit 'c3c38e10c928abb834b7982072066658cf3007aa':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 代码规范
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复图表配置+优化环境切换
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 优化断开提醒
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 优化启动与切换
5 months ago
Destiny.Lin
c3c38e10c9
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 代码规范
5 months ago
Destiny.Lin
1e480d4457
Merge remote-tracking branch 'origin/mss/2.0' into mss/2.0
5 months ago
Destiny.Lin
8bdbb3f329
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复图表配置+优化环境切换
5 months ago
Destiny.Lin
124ea3970e
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 优化断开提醒
5 months ago
Destiny.Lin
e2443d1219
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 优化启动与切换
5 months ago
superman
6069329c32
Merge pull request #14242 in DESIGN/design from mss/2.0 to fbp-1.0
...
* commit 'f70f81fbf807b38e27627401a9da7021e4ebb5de':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 兼容单元格边框
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善远程报错
5 months ago
Destiny.Lin-林锦龙
f70f81fbf8
Pull request #14240 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '3d1627e287253e0d3cbfb79882809ba32e190c76':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 兼容单元格边框
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善远程报错
5 months ago
Destiny.Lin
3d1627e287
Merge remote-tracking branch 'origin/mss/2.0' into mss/2.0
5 months ago
Destiny.Lin
81ae18d7ee
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 兼容单元格边框
5 months ago
Destiny.Lin
d90d493d44
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善远程报错
5 months ago
Levy.Xie-解安森
18efcac0f2
Pull request #14228 : REPORT-127241 & REPORT-127462 fix: 设计器性能埋点字段问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0
* commit '4cff4a2dd7b5e72ad6b4851fb5f4952be7079e75':
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
5 months ago
Richard.Fang-方超
a92bbe33c5
Pull request #14225 : REPORT-125224 fix:补充设计器启动计时器关闭
...
Merge in DESIGN/design from ~RICHARD.FANG/design:release/11.0 to release/11.0
* commit '8cbef9ef05e790eb558e4eef1c61408b500b3c8d':
REPORT-125224 fix:补充设计器启动计时器关闭
5 months ago
superman
74dd2f7c0c
Merge pull request #14223 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'f0eb1a8cad41bb601d2aa307124ae06aa686f379':
5 months ago
superman
48b2497573
Pull request #14230 : 无jira任务, mss/2.0 合 fbp-1.0
...
Merge in DESIGN/design from mss/2.0 to fbp-1.0
* commit 'bc0fd2632ce5fcde2215e611a24984bbb9067b16':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 补充数据集的bean的属性
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善数据集与数据连接
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 预留token接口+完善报错
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善部分代码+屏蔽frm入口
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 适配数据连接+地图配置
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动
KERNEL-18926 修改包名
5 months ago
Levy.Xie-解安森
4cff4a2dd7
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
5 months ago
Destiny.Lin-林锦龙
bc0fd2632c
Pull request #14227 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 补充数据集的bean的属性
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '879caddc57fa2ce95881f7dab388a9422e06be82':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 补充数据集的bean的属性
5 months ago
Destiny.Lin
879caddc57
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 补充数据集的bean的属性
5 months ago
Destiny.Lin-林锦龙
60b7a86690
Pull request #14226 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善数据集与数据连接
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '5bf991aa701f5dabd9420ec7558268b9de46a73e':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善数据集与数据连接
5 months ago
Destiny.Lin
5bf991aa70
Merge remote-tracking branch 'origin/mss/2.0' into mss/2.0
5 months ago
Destiny.Lin
d078e947dd
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善数据集与数据连接
5 months ago
Destiny.Lin-林锦龙
4959f5b8c9
Pull request #14224 : REPORT-114391 【微服务适配】远程&本地设计器能够正常启动
...
Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0
* commit '47f2e189eea2eeb67e6804b855770013637d1864':
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 预留token接口+完善报错
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善部分代码+屏蔽frm入口
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 适配数据连接+地图配置
5 months ago
Richard.Fang
8cbef9ef05
REPORT-125224 fix:补充设计器启动计时器关闭
5 months ago
Destiny.Lin
47f2e189ee
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 预留token接口+完善报错
5 months ago
Destiny.Lin
e4a1d49870
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 完善部分代码+屏蔽frm入口
5 months ago
Richard.Fang-方超
d930424c5f
Pull request #14213 : REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
...
Merge in DESIGN/design from ~RICHARD.FANG/design:release/11.0 to release/11.0
* commit '5980231c6de2cb0498c56fadbf088202425ed242':
REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
5 months ago
Zhanying-占盈
587ee033ec
Pull request #14205 : REPORT-70155 fix: fvs根据主题样式创建默认单元格 REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit 'ad86fcdb91469123a734187bb38c99ade470e529':
REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
REPORT-70155 fix: fvs根据主题样式创建默认单元格
5 months ago
renekton
b0b0dee1e4
Merge branch 'newui' of ssh://code.fineres.com:7999/~renekton/design into newui
5 months ago
Renekton-张世豪
105ea14bd1
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '287996fbecd7221fc02187e4675e35f6c4563a3b':
REPORT-113994 feat:TabPane组件实现
REPORT-113994 feat:TabPane组件实现
5 months ago
Levy.Xie-解安森
287996fbec
Pull request #14214 : REPORT-113994 feat:TabPane组件实现
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '4f0a24f5e751a22ddbad8ff5483d7f45c21f4293':
REPORT-113994 feat:TabPane组件实现
REPORT-113994 feat:TabPane组件实现
5 months ago
Destiny.Lin
06f8fd78a8
REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 适配数据连接+地图配置
5 months ago
renekton
e3b9ac78c6
报表引擎属性弹窗翻新
5 months ago
superman
f0eb1a8cad
Merge pull request #14222 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8e193974a51da4bd7ab34dc48710c9ebea866b1c':
5 months ago