Renekton-张世豪
a17029f4ad
Fixed merge conflict
4 months ago
Richard.Fang-方超
fec731b043
Pull request #14789 : REPORT-133990 & REPORT-133567 & REPORT-133398 & REPORT-133389 & REPORT-132370 & REPORT-133696 & REPORT-131838【newUI】fix:国际化布局调整及fbp回归问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release
* commit 'c58953bcc7d1f43b0906998032b4e5b51a2a4e06':
REPORT-133990 & REPORT-133567 & REPORT-133398 & REPORT-133389 & REPORT-132370 & REPORT-133696 & REPORT-131838【newUI】fix:国际化布局调整及fbp回归问题修复
REPORT-133990 & REPORT-133567 & REPORT-133398 & REPORT-133389 & REPORT-132370 & REPORT-133696 & REPORT-131838【newUI】fix:国际化布局调整及fbp回归问题修复
4 months ago
superman
9ccf33de30
Merge pull request #14797 in DESIGN/design from fbp/release to fbp/feature
...
* commit '4b1b0cc9620f24f852a9e17abf404a3c369fc279':
无JIRA任务 改了前端bug,更新一波js
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
无jira任务 删多了
REPORT-132414 & REPORT-132506 优化菜单入口修复弹窗等
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
REPORT-133183 【fr-fbp回归】【数据集】236环境,新建/编辑存在驱动的mysql数据连接,保存报错
4 months ago
renekton
b340ec2ef9
方法修改
4 months ago
renekton
3ec63c5058
提取方法
4 months ago
renekton
43f9b6f312
方法提取
4 months ago
renekton
2ed62939b9
用定好的常量替代
4 months ago
vito-刘恒霖
4b1b0cc962
Pull request #14790 : REPORT-132414 & REPORT-132506 优化菜单入口修复弹窗等
...
Merge in DESIGN/design from ~VITO/c-design:fbp/release to fbp/release
* commit 'eeaf130d80e84a9b67b6034f761fb05d20c7c487':
无jira任务 删多了
REPORT-132414 & REPORT-132506 优化菜单入口修复弹窗等
4 months ago
Kobi-蒋科斌
651fd4a655
Pull request #14795 : 无JIRA任务 改了前端bug,更新一波js
...
Merge in DESIGN/design from ~KOBI/design:fbp/release to fbp/release
* commit '23d7b366d7aa569399af362ab3b96b88236b85b8':
无JIRA任务 改了前端bug,更新一波js
4 months ago
Kobi
23d7b366d7
无JIRA任务 改了前端bug,更新一波js
4 months ago
Richard.Fang
c58953bcc7
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
# designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
4 months ago
Richard.Fang
daa843ad8e
REPORT-133990 & REPORT-133567 & REPORT-133398 & REPORT-133389 & REPORT-132370 & REPORT-133696 & REPORT-131838【newUI】fix:国际化布局调整及fbp回归问题修复
4 months ago
Destiny.Lin-林锦龙
3250101685
Pull request #14794 : REPORT-133183 & REPORT-133535
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit 'd6508e670b49fc46e92ff1bc295d8debd63aaf2e':
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
REPORT-133183 【fr-fbp回归】【数据集】236环境,新建/编辑存在驱动的mysql数据连接,保存报错
4 months ago
superman
b31953ff7a
Merge pull request #14793 in DESIGN/design from fbp/release to fbp/feature
...
* commit 'f663dbb1f5f97db2fd01659b2b89d67c880386f8':
fix:窗口重复缩放
REPORT-133693 & REPORT-133882 & REPORT-133878 fix: NewUI 控件显示增强配&Form遗漏面板翻新
4 months ago
Destiny.Lin
d6508e670b
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
4 months ago
renekton
665df85d08
模板主题tab修改
4 months ago
vito
eeaf130d80
无jira任务 删多了
4 months ago
vito
075d7e2111
Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~vito/c-design into fbp/release
4 months ago
vito
3ff87754b5
REPORT-132414 & REPORT-132506 优化菜单入口修复弹窗等
4 months ago
renekton
5c2a58e137
Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~renekton/design into fbp/release
4 months ago
renekton
32ac35038d
提交面板布局问题&主题模板国际化布局问题&单元格不随渐变条变化
4 months ago
Destiny.Lin
645afdbf97
REPORT-133535 【fr-fbp回归】模板内数据连接鉴权失败
4 months ago
Richard.Fang
312ea3fe96
REPORT-133990 & REPORT-133567 & REPORT-133398 & REPORT-133389 & REPORT-132370 & REPORT-133696 & REPORT-131838【newUI】fix:国际化布局调整及fbp回归问题修复
4 months ago
Destiny.Lin
af3e23c5aa
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
4 months ago
Zongyu.Wang-王宗雨
f663dbb1f5
Pull request #14788 : REPORT-134013 fix:窗口重复缩放
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/release to fbp/release
* commit 'cf556bfe136039b291ffe813e30303a6d65b5891':
fix:窗口重复缩放
4 months ago
lemon
cf556bfe13
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
4 months ago
lemon
38995898be
fix:窗口重复缩放
4 months ago
Destiny.Lin
5aef646d33
REPORT-133183 【fr-fbp回归】【数据集】236环境,新建/编辑存在驱动的mysql数据连接,保存报错
4 months ago
Levy.Xie-解安森
ff4bcc715f
Pull request #14778 : REPORT-133693 & REPORT-133882 & REPORT-133878 fix: NewUI 控件显示增强&Form遗漏面板翻新
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release
* commit '45c0952541b39feff0a996011aefdc05cc824019':
REPORT-133693 & REPORT-133882 & REPORT-133878 fix: NewUI 控件显示增强配&Form遗漏面板翻新
4 months ago
superman
4f2a6a96c9
Merge pull request #14787 in DESIGN/design from fbp/release to fbp/feature
...
* commit '9ffca8b061bf06666aa370804a30395798f26f86':
无jira任务, 删除无用代码
REPORT-133888 【fr-fbp回归】文件数据集excel只能被选一次
REPORT-133908 【fr-fbp回归】DB2 新建存储过程显示数据库连接失败
4 months ago
kerry-王周勇
9ffca8b061
Pull request #14785 : 无jira任务, 删除无用代码
...
Merge in DESIGN/design from ~KERRY/design_10.0:fbp/release to fbp/release
* commit '8ff689ba4dd429d56288dd7d7ce4a391d8ea980b':
无jira任务, 删除无用代码
4 months ago
kerry
8ff689ba4d
无jira任务, 删除无用代码
4 months ago
Destiny.Lin-林锦龙
682f0c872f
Pull request #14781 : REPORT-133888 【fr-fbp回归】文件数据集excel只能被选一次 & REPORT-133908 【fr-fbp回归】DB2 新建存储过程显示数据库连接失败
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit 'a1c8275bde78246e2cf99a34d5ffd32ca21e7ba9':
REPORT-133888 【fr-fbp回归】文件数据集excel只能被选一次
REPORT-133908 【fr-fbp回归】DB2 新建存储过程显示数据库连接失败
4 months ago
superman
921102c1ef
Merge pull request #14784 in DESIGN/design from fbp/feature to fbp/release
...
* commit 'e336bba7529c3649612cd0f938ef6ee74fcaa3ad':
REPORT-127437 fix: 去掉不用的代码
REPORT-127437 fix: 插件图标适配代码调整
无jira任务,修复打包
REPORT-127437 fix: 调整代码逻辑,插件跟设计器共用 icon 加载方式,调整插件 icon 和 set 的 id 标识
无jira任务,修复打包
无jira任务,修复打包
无jira任务,修复打包
REPORT-127437 feat:调整代码,增加 mapSet
REPORT-127437 feat:适配插件图标
REPORT-127437 feat:适配插件图标
4 months ago
Destiny.Lin
a1c8275bde
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
4 months ago
Destiny.Lin
a01affc9e5
REPORT-133888 【fr-fbp回归】文件数据集excel只能被选一次
4 months ago
superman
e336bba752
Merge pull request #14777 in DESIGN/design from fbp/release to fbp/feature
...
* commit '249f552c4b3eff636e841b9d8da918025efe1417':
REPORT-133888 - 【fr-fbp回归】文件数据集excel只能被选一次
REPORT-133863 【fr-fbp回归】数据字典获取数据库字段空白
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
REPORT-133110 【fr-fbp回归】【FR图表】区域地图-类型-地图边界,地理信息和自定义图片无法选中并展开选择子层级内容
缩放以及事件不响应
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
fix: 回退调整滚动条的代码
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
fix: 解决代码规范问题
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
REPORT-127437 fix: newui 视觉修复
REPORT-133442 【fr-fbp回归】【数据集】数据连接驱动选择自定义,保存后二次编辑,仍选择默认驱动
4 months ago
Destiny.Lin
2ffd076c07
REPORT-133908 【fr-fbp回归】DB2 新建存储过程显示数据库连接失败
4 months ago
Levy.Xie-解安森
45c0952541
REPORT-133693 & REPORT-133882 & REPORT-133878 fix: NewUI 控件显示增强配&Form遗漏面板翻新
4 months ago
Destiny.Lin-林锦龙
249f552c4b
Pull request #14775 : REPORT-133863 【fr-fbp回归】数据字典获取数据库字段空白 & REPORT-133888 - 【fr-fbp回归】文件数据集excel只能被选一次
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit 'd4f2efb85a96a50a0422f47b28bf9b366c8ee09b':
REPORT-133888 - 【fr-fbp回归】文件数据集excel只能被选一次
REPORT-133863 【fr-fbp回归】数据字典获取数据库字段空白
4 months ago
Zongyu.Wang-王宗雨
a9aa5ada08
Pull request #14771 : REPORT-133761 & REPORT-133341 & REPORT-133299 & REPORT-133179 & REPORT-132510 fix: newui 视觉修复
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/release to fbp/release
* commit '8888ff5f866531a4da1b6824146c5bf395c9ed0e':
fix: 回退调整滚动条的代码
fix: 解决代码规范问题
REPORT-127437 fix: newui 视觉修复
4 months ago
Destiny.Lin
d4f2efb85a
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
4 months ago
Destiny.Lin
7cfeaef10c
REPORT-133888 - 【fr-fbp回归】文件数据集excel只能被选一次
4 months ago
Levy.Xie-解安森
9ca974c7a4
Pull request #14772 : REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release
* commit '8a1c5c2eb56263c332916c835afac246ce80397b':
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
REPORT-132393 & REPORT-133561 fix:NewUI 修复图标问题&图表区域遗漏翻新布局
4 months ago
Destiny.Lin
b9b7bd89f7
REPORT-133863 【fr-fbp回归】数据字典获取数据库字段空白
4 months ago
Renekton-张世豪
58701b7071
Pull request #14773 : REPORT-133339 & REPORT-130408
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release
* commit '63550c49a7e4f1357391bdd197380858fb4e5ad3':
缩放以及事件不响应
4 months ago
Destiny.Lin-林锦龙
170b835938
Pull request #14774 : REPORT-133110 【fr-fbp回归】【FR图表】区域地图-类型-地图边界,地理信息和自定义图片无法选中并展开选择子层级内容 & REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit '84668af345dbcf89e4b403e2b4dc4719c2472bcf':
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
REPORT-133110 【fr-fbp回归】【FR图表】区域地图-类型-地图边界,地理信息和自定义图片无法选中并展开选择子层级内容
4 months ago
Destiny.Lin
84668af345
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
4 months ago
Destiny.Lin
5e649c4757
REPORT-133186 【fr-fbp回归】【数据集】fbp设计器远程设计,新建mysql数据连接,开启SSL通道后读不到CA证书
4 months ago
Destiny.Lin
82863e626d
REPORT-133110 【fr-fbp回归】【FR图表】区域地图-类型-地图边界,地理信息和自定义图片无法选中并展开选择子层级内容
4 months ago