1130b36dfc
Merge pull request #15090 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '6c627a1760cc11b7a7d30c56bb62ad333c4fc34c':
1 month ago
6c627a1760
Merge pull request #15089 in DESIGN/design from final/11.0 to release/11.0
...
* commit '1a1c0f52aa9eae0fa614a8bb3ec8cc9ee32fbad8':
1 month ago
1a1c0f52aa
Merge pull request #15082 in DESIGN/design from release/11.0 to final/11.0
...
* commit '011edc36e55b4f1b7ddf6c372a116d190c8936ff': (22 commits)
REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
alpha搜索增加fvs文件
REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失
REPORT-135106 表格字体加载问题和语言导致的图表消失问题
配置放在设计器模块
配置放在设计器模块
REPORT-135046 feat:设计器语言切换支持扩展新语种
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
REPORT-131817 高德国产图层替换Mapbox图层
REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
按钮不用加tooltip，回滚一下
REPORT-106743 fix:设计器地图英文显示问题
增加AppTypeFilter过滤插件类型，如果为空则不过滤
REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
控件剪切、复制按钮fix
控件剪切、复制按钮fix
控件剪切、复制按钮fix
...
1 month ago
23ed07cf2f
Merge pull request #15069 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '011edc36e55b4f1b7ddf6c372a116d190c8936ff':
REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
alpha搜索增加fvs文件
1 month ago
011edc36e5
Pull request #14989 : REPORT-69017 alphafine搜不到fvs
...
Merge in DESIGN/design from ~RENEKTON/design:release/11.0 to release/11.0
* commit '7f2c5827d76658d68e7bc8df711208fdcec47e76':
alpha搜索增加fvs文件
1 month ago
af0abd8398
Pull request #15052 : REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
...
Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0
* commit 'd4aa48cd2b04bc514178671723e8d359a7ccca4c':
REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
1 month ago
d4aa48cd2b
REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
1 month ago
4fb9326a61
Merge pull request #14996 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '34084075b64ff79d3fdc04e8e3a0422a76e1376d':
REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失
REPORT-135106 表格字体加载问题和语言导致的图表消失问题
REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
按钮不用加tooltip，回滚一下
REPORT-106743 fix:设计器地图英文显示问题
增加AppTypeFilter过滤插件类型，如果为空则不过滤
REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
REPORT-117444 fix:模板主题管理2个相同的key，重复去掉一个
REPORT-119602 fix:韩语设计器鼠标失焦，选不到数据脱敏
1 month ago
34084075b6
Merge pull request #14995 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'eedf1b697c1a498a29f94290c8cb3beb6ff95b56':
1 month ago
eedf1b697c
Merge pull request #14994 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '0b7fddf0613642852fa6304741adc06ee89e1aff':
1 month ago
lidongy-李东原
f7ac18e54a
Pull request #14984 : REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失
...
Merge in DESIGN/design from ~LIDONGY/design:release/11.0 to release/11.0
* commit 'daf94d29f4ca58bac106e1be0b967d539b592b6a':
REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失
1 month ago
7f2c5827d7
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~renekton/design into release/11.0
1 month ago
56d31c997f
alpha搜索增加fvs文件
1 month ago
lidongy
daf94d29f4
REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失
1 month ago
97d87993eb
Merge pull request #14983 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit '8d5fbefe2c1d1d94e069268f97f28663e9b43965':
配置放在设计器模块
配置放在设计器模块
REPORT-135046 feat:设计器语言切换支持扩展新语种
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-131817 高德国产图层替换Mapbox图层
REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
1 month ago
8d5fbefe2c
Merge pull request #14974 in DESIGN/design from feature/x to bugfix/11.0
...
* commit 'b72d824fd36fbfd825cf3d457825ca779964b3fd':
配置放在设计器模块
配置放在设计器模块
REPORT-135046 feat:设计器语言切换支持扩展新语种
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-131817 高德国产图层替换Mapbox图层
REPORT-134777 超链名称支持公式计算-全局查找匹配不到控件里的公式
REPORT-126773 fix: 修复自定义主题修改配色预览不生效问题
2 months ago
f76b65e103
Pull request #14939 : REPORT-135106 表格字体加载问题和语言导致的图表消失问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '813ada35e87d3405b3ad84c080472c62b85f4d94':
REPORT-135106 表格字体加载问题和语言导致的图表消失问题
2 months ago
813ada35e8
REPORT-135106 表格字体加载问题和语言导致的图表消失问题
2 months ago
Obo-王学仁
b72d824fd3
Pull request #14918 : REPORT-135046 feat:设计器语言切换支持扩展新语种
...
Merge in DESIGN/design from ~OBO/design:feature/x to feature/x
* commit '83ad455a6794b2661942849b12b965f32c8c3f51':
配置放在设计器模块
配置放在设计器模块
REPORT-135046 feat:设计器语言切换支持扩展新语种
2 months ago
obo
83ad455a67
配置放在设计器模块
2 months ago
obo
8b63802703
配置放在设计器模块
2 months ago
obo
d17b810076
REPORT-135046 feat:设计器语言切换支持扩展新语种
2 months ago
3a1118183a
Pull request #14882 : REPORT-131817 高德国产图层替换Mapbox图层
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:feature/x to feature/x
* commit 'c9acbcae37847bb104a7525eb8bb3063b77b1cad':
REPORT-131817 高德国产图层替换Mapbox图层
2 months ago
2837c407e6
Pull request #14875 : REPORT-130762 feat:JNDI数据连接提供禁用配置
...
Merge in DESIGN/design from ~RICHARD.FANG/design:feature/x to feature/x
* commit '89e802b9bc3924d89f0d5c5477e030ef3e3d30b0':
REPORT-130762 feat:JNDI数据连接提供禁用配置
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
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
519532f80b
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
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
a4e94ff31b
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
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
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
7a58801bae
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
d6e5cd8f31
REPORT-130762 feat:JNDI数据连接提供禁用配置
2 months ago
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
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
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
8d11dc5e49
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~renekton/design into release/11.0
3 months ago
398b9397b5
增加AppTypeFilter过滤插件类型，如果为空则不过滤
3 months ago
f14b53bf60
REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
3 months ago
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
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
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
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
superman
Renekton-张世豪
Leo.Qin-覃宇攀
lidongy-李东原
lidongy
fanglei-方磊
方磊
Obo-王学仁
Shengzu.Xue-薛胜祖
Richard.Fang-方超
Levy.Xie-解安森
zack-申凯鹏
Zhanying-占盈
Zhanying
Anner-王敬松
Anner