Richard.Fang
89e802b9bc
Merge remote-tracking branch 'origin/feature/x' into feature/x
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
2 months ago
Richard.Fang
519532f80b
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
Richard.Fang
2e50d19401
Merge remote-tracking branch 'origin/feature/x' into feature/x
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
2 months ago
Richard.Fang
a4e94ff31b
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
Levy.Xie-解安森
9a2316a433
Pull request #14873 : REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
...
Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0
* commit '05b06432a1676bf69b4a6e56335089b5c3e0c75f':
REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
2 months ago
Richard.Fang
a4f3b027fb
Merge remote-tracking branch 'origin/feature/x' into feature/x
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
# designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
# designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
2 months ago
Richard.Fang
7a58801bae
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
Richard.Fang
d6e5cd8f31
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
Levy.Xie-解安森
05b06432a1
REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
2 months ago
zack-申凯鹏
8d161cd761
Pull request #14864 : REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
...
Merge in DESIGN/design from ~ZACK/design:feature/x to feature/x
* commit '93ac7196f7c36357f4e5fe622bb129cdad656f23':
REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
2 months ago
shengzu.xue
c9acbcae37
REPORT-131817 高德国产图层替换Mapbox图层
2 months ago
凯鹏 申
93ac7196f7
REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
2 months ago
Obo-王学仁
bf145ae860
Pull request #14842 : REPORT-106743 fix:设计器地图英文显示问题
...
Merge in DESIGN/design from ~OBO/design:release/11.0 to release/11.0
* commit 'd878d8a94783b492a3a6f4d394f0178e4f1fba7a':
按钮不用加tooltip,回滚一下
REPORT-106743 fix:设计器地图英文显示问题
2 months ago
obo
d878d8a947
按钮不用加tooltip,回滚一下
2 months ago
obo
f09af5d353
REPORT-106743 fix:设计器地图英文显示问题
2 months ago
Zhanying-占盈
27fa35221f
Pull request #14755 : REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit 'f14b53bf60af72c90dd789393d2cec70d92c15ba':
REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
3 months ago
Renekton-张世豪
906e82b025
Pull request #14760 : REPORT-68778 - 导出事件-导出其他模板不应该支持选择fvs
...
Merge in DESIGN/design from ~RENEKTON/design:release/11.0 to release/11.0
* commit '8d11dc5e494f161bf5886c4a0d397e2678a17989':
增加AppTypeFilter过滤插件类型,如果为空则不过滤
3 months ago
renekton
8d11dc5e49
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~renekton/design into release/11.0
3 months ago
renekton
398b9397b5
增加AppTypeFilter过滤插件类型,如果为空则不过滤
3 months ago
Zhanying
f14b53bf60
REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
3 months ago
superman
0b7fddf061
Merge pull request #14711 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '967684f2d2eb23507492862703db99909d50bae0':
REPORT-117444 fix:模板主题管理2个相同的key,重复去掉一个
REPORT-119602 fix:韩语设计器鼠标失焦,选不到数据脱敏
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
REPORT-125641 fix:设计器显示问题-英语显示不全
3 months ago
Anner-王敬松
553f295ea4
Pull request #14690 : REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
...
Merge in DESIGN/design from ~ANNER/design:feature/x to feature/x
* commit '213181dc99a11f01a6a661e619fdb8ae624ff429':
REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
3 months ago
superman
659dc8ae33
Merge pull request #14687 in DESIGN/design from final/11.0 to release/11.0
...
* commit '967684f2d2eb23507492862703db99909d50bae0':
REPORT-117444 fix:模板主题管理2个相同的key,重复去掉一个
REPORT-119602 fix:韩语设计器鼠标失焦,选不到数据脱敏
3 months ago
Anner
213181dc99
REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
3 months ago
Obo-王学仁
967684f2d2
Pull request #14677 : REPORT-117444 fix:模板主题管理2个相同的key,重复去掉一个
...
Merge in DESIGN/design from ~OBO/design:final/11.0 to final/11.0
* commit '991f6203b19a2cda37f2ae6662a39c01fc828ce8':
REPORT-117444 fix:模板主题管理2个相同的key,重复去掉一个
3 months ago
obo
991f6203b1
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
3 months ago
obo
a5d89b1e22
REPORT-117444 fix:模板主题管理2个相同的key,重复去掉一个
3 months ago
Obo-王学仁
bb0f1ad8a5
Pull request #14676 : REPORT-119602 fix:韩语设计器鼠标失焦,选不到数据脱敏
...
Merge in DESIGN/design from ~OBO/design:final/11.0 to final/11.0
* commit '79db43c1a6a662d5499b959c5920c6192a430f71':
REPORT-119602 fix:韩语设计器鼠标失焦,选不到数据脱敏
3 months ago
obo
79db43c1a6
REPORT-119602 fix:韩语设计器鼠标失焦,选不到数据脱敏
3 months ago
superman
88615ae7bd
Merge pull request #14579 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '92543893b62166bb3b761a6a651f2839cba3010c':
控件剪切、复制按钮fix
控件剪切、复制按钮fix
控件剪切、复制按钮fix
报表引擎属性弹窗翻新
报表引擎属性弹窗翻新
3 months ago
superman
92543893b6
Merge pull request #14578 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'b056d1564d22cbc04d3c31ba2b60412fb613c428':
控件剪切、复制按钮fix
控件剪切、复制按钮fix
控件剪切、复制按钮fix
报表引擎属性弹窗翻新
报表引擎属性弹窗翻新
3 months ago
Renekton-张世豪
b056d1564d
Pull request #14563 : REPORT-119475 - 【设计器】参数面板的控件选中后,无法使用工具栏的剪切、复制功能
...
Merge in DESIGN/design from ~RENEKTON/design:release/11.0 to release/11.0
* commit '3ffa64c109b943ca34da13d4aae2f6d4522ee44b':
控件剪切、复制按钮fix
控件剪切、复制按钮fix
控件剪切、复制按钮fix
报表引擎属性弹窗翻新
报表引擎属性弹窗翻新
3 months ago
renekton
3ffa64c109
控件剪切、复制按钮fix
3 months ago
renekton
c5f5d55b68
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~renekton/design into release/11.0
3 months ago
renekton
884b5ed842
控件剪切、复制按钮fix
3 months ago
Renekton-张世豪
b7572bb236
Merging in latest from upstream (DESIGN/design:refs/heads/release/11.0)
...
* commit 'e98ba08e023c880506de7eb1c1c8e9183706f3bd':
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
REPORT-125641 fix:设计器显示问题-英语显示不全
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
REPORT-128652 开启模板认证后,新建fvs模板报错。 【问题原因】主jar修改了sessionID相关的校验,导致fvs插件的部分接口无法通过校验。 【改动思路】更新jar强制FVS插件升级,通过提高fvs独占接口api level实现
REPORT-125641 fix:设计器显示问题-英语显示不全
REPORT-128068 fix:设计器按钮显示不全且无tooltips
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性能监控
3 months ago
renekton
620f17f591
控件剪切、复制按钮fix
3 months ago
superman
319d772440
Merge pull request #14467 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '684f61941020d307b2af7206e85a2b13e84e7afc':
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
superman
684f619410
Merge pull request #14466 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'e98ba08e023c880506de7eb1c1c8e9183706f3bd':
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
superman
e98ba08e02
Merge pull request #14465 in DESIGN/design from final/11.0 to release/11.0
...
* commit '845e5c7ef9894ab8cebcb1fb61859d7696456bdc':
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
Obo-王学仁
845e5c7ef9
Pull request #14457 : REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
...
Merge in DESIGN/design from ~OBO/design:final/11.0 to final/11.0
* commit '4d921ee2548d099fb1b73e46c37bfc7259aa7562':
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
4 months ago
obo
4d921ee254
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
4 months ago
obo
e5a195e285
REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
4 months ago
Obo-王学仁
21fe2c4631
Pull request #14456 : REPORT-125641 fix:设计器显示问题-英语显示不全
...
Merge in DESIGN/design from ~OBO/design:final/11.0 to final/11.0
* commit '0ab94a4b753db8f1a7b56692790ad81dde2042e0':
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
obo
0ab94a4b75
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
superman
492d01141b
Merge pull request #14376 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '5a7a2c00983f93cfe76bdd70f2eca008ea89440a':
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
4 months ago
superman
5a7a2c0098
Merge pull request #14375 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '2d46316661e6c2bb9526b7bfcd0a0ce3a2547c86':
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
4 months ago
superman
2d46316661
Merge pull request #14374 in DESIGN/design from final/11.0 to release/11.0
...
* commit '24cf1235cd10eb71a671fd38cfe70f0e17973d5d':
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
4 months ago
superman
24cf1235cd
Merge pull request #14373 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '7d00497bd47762a36abcd64baa0dd65d3d7a7e1a':
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
4 months ago
Leo.Qin-覃宇攀
7d00497bd4
Pull request #14367 : Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
...
Merge in DESIGN/design from ~LEO.QIN/design:persist/11.0 to persist/11.0
* commit 'd0d6d6c634b8fc3aa9f2df564d7125b796d4ae07':
Revert "REPORT-128652 开启模板认证后,新建fvs模板报错。"
4 months ago