Richard.Fang
f143708c97
Merge remote-tracking branch 'origin/newui' into newui
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
# designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
# designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
# designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
# designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
# designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
# designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java
# designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java
# designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
# designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
# designer-realize/src/main/java/com/fr/design/report/WordExportPane.java
# designer-realize/src/main/java/com/fr/design/report/mobile/AppFitBrowserPane.java
# designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java
# designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java
# designer-realize/src/main/java/com/fr/design/report/mobile/MobileRadioGroupPane.java
# designer-realize/src/main/java/com/fr/design/report/mobile/ReportMobileAttrPane.java
# designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java
# designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
# designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
# designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
# designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
# designer-realize/src/main/java/com/fr/design/webattr/ToolBarButton.java
# designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
# designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
# designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
5 months ago
Richard.Fang
5ad2c6b311
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
5 months ago
Levy.Xie-解安森
3b82c7fa22
Merge remote-tracking branch 'origin/newui' into newui
5 months ago
Levy.Xie-解安森
28eede8586
REPORT-113994 【NewUI】设计器样式翻新-图表
5 months ago
Richard.Fang
b62c339951
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
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
Levy.Xie-解安森
462452de1a
REPORT-113994 【NewUI】设计器样式翻新-图表
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
renekton
e3b9ac78c6
报表引擎属性弹窗翻新
5 months ago
Levy.Xie-解安森
4f0a24f5e7
REPORT-113994 feat:TabPane组件实现
5 months ago
Levy.Xie-解安森
9f849586a0
REPORT-113994 feat:TabPane组件实现
5 months ago
张世豪
6963a13080
报表引擎属性弹窗翻新
5 months ago
张世豪
1d662d3efb
报表引擎属性弹窗翻新
5 months ago
张世豪
9c31c6a877
报表引擎属性弹窗翻新
6 months ago
vito-刘恒霖
6a6778e215
Pull request #14115 : REPORT-114888 icon无法找到_disable图标时使用系统默认灰化图
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit '8a4b2a3c1c2d0626df5f5ab7ab821550f8878be6':
无jira任务 代码质量
无jira任务 代码质量
无jira任务 优化报错信息
REPORT-114888 优化调用性能完善单测
REPORT-114888 icon无法找到_disable图标时使用系统默认灰化图
6 months ago
vito
8a4b2a3c1c
无jira任务 代码质量
6 months ago
vito
63b2c69430
无jira任务 代码质量
6 months ago
vito
0c27d45923
无jira任务 优化报错信息
6 months ago
vito
3ccf99e1e9
REPORT-114888 优化调用性能完善单测
7 months ago
vito
dd7f075f16
REPORT-114888 icon无法找到_disable图标时使用系统默认灰化图
7 months ago
vito-刘恒霖
bf1304e759
Pull request #14045 : REPORT-113994 bugfix: flex布局应用修复滚动
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit 'd1f5f4abfe02fc6b3670d853b13654743271ba60':
REPORT-113994 bugfix: flex布局应用修复滚动
7 months ago
vito
d1f5f4abfe
REPORT-113994 bugfix: flex布局应用修复滚动
7 months ago
vito-刘恒霖
afbf5f2197
Pull request #14018 : REPORT-113994 fix: bbs图标损坏
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit '3399f9fdb6ddcfc568e5e5565173755f0665332b':
REPORT-113994 fix: bbs图标损坏
7 months ago
vito
3399f9fdb6
REPORT-113994 fix: bbs图标损坏
7 months ago
Levy.Xie-解安森
9476314b45
Pull request #13958 : REPORT-111995 【NewUI】文件-选项和帮助面板翻新
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit 'db6489c34a5f24efa8b82c55c739aff000911c1d':
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
7 months ago
Levy.Xie-解安森
db6489c34a
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
8 months ago
Levy.Xie-解安森
36a50e6176
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
8 months ago
vito-刘恒霖
1e1d47b887
Pull request #13944 : REPORT-114888 & REPORT-113994 feat: 图标管理器优化
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit '2936dc76b51cc313e9bd00635643e60149bd881b':
补充提交
REPORT-114888 feat: 图标管理器优化 1. 支持png注册 2. 支持查找旧版图标 3. 新图标配置文件注册方式 3. 优化调用性能
8 months ago
vito
2936dc76b5
补充提交
8 months ago
vito
7932b9a659
Merge branch 'newui' of ssh://code.fineres.com:7999/~vito/c-design into newui
...
# Conflicts:
# designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java
8 months ago
vito
f2c8761693
REPORT-114888 feat: 图标管理器优化
...
1. 支持png注册
2. 支持查找旧版图标
3. 新图标配置文件注册方式
3. 优化调用性能
8 months ago
Leo.Qin-覃宇攀
84200c3081
Pull request #13942 : REPORT-111997 NewUI 修改按钮布局
...
Merge in DESIGN/design from ~LEO.QIN/design:newui to newui
* commit '5985e677da559d734668a22daa8c12793faf2ee4':
REPORT-111997 NewUI 修改按钮样式
8 months ago
Leo.Qin
5985e677da
Merge remote-tracking branch 'origin/newui' into newui
8 months ago
Leo.Qin
de85a0815d
REPORT-111997 NewUI 修改按钮样式
8 months ago
Levy.Xie-解安森
299995f71b
Pull request #13941 : REPORT-111995 【NewUI】修复测试验收问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '7d717e353c6b73c05c24a0fc6a7d6069de4253b4':
REPORT-111995 【NewUI】修复测试验收问题
8 months ago
Levy.Xie-解安森
7d717e353c
REPORT-111995 【NewUI】修复测试验收问题
8 months ago
vito-刘恒霖
38b93b4656
Pull request #13937 : REPORT-114888 fix: 模板tab栏右键弹窗显示异常
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit 'd32d2c0d57e423ed4307ddfed1a5f657fddeb86d':
REPORT-114888 fix: 模板tab栏右键弹窗显示异常
8 months ago
vito
d32d2c0d57
REPORT-114888 fix: 模板tab栏右键弹窗显示异常
8 months ago
Levy.Xie-解安森
febd91da59
Pull request #13931 : REPORT-111995 【NewUI】数据列面板翻新
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '8eb2df765fe532ed642d3ce2a0495baf0a886abf':
REPORT-111995 【NewUI】数据列面板翻新
9 months ago
Levy.Xie-解安森
8eb2df765f
REPORT-111995 【NewUI】数据列面板翻新
9 months ago
Levy.Xie-解安森
24d48aecc8
Pull request #13824 : REPORT-116247 【NewUI】单元格属性-文字样式面板问题处理
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '74b1c75fc8176210a7ab30c779a720ac15cce5fd':
REPORT-116247 【NewUI】单元格属性-文字样式面板问题处理
9 months ago
Levy.Xie-解安森
74b1c75fc8
REPORT-116247 【NewUI】单元格属性-文字样式面板问题处理
9 months ago
vito-刘恒霖
c5b15e0f20
Pull request #13744 : REPORT-116390【NewUI】搜索面板自动聚焦输入
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit '08a14918835ebf4660dab90636b2b69739b8c167':
REPORT-116390【NewUI】搜索面板自动聚焦输入
9 months ago
vito
08a1491883
REPORT-116390【NewUI】搜索面板自动聚焦输入
9 months ago
vito-刘恒霖
0aa0754129
Pull request #13694 : 无jira任务 同步release到Newui
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit 'aee26219b4a4f31f386edfe762812330e4770277':
REPORT-115175 模板主题按钮显示不全
REPORT-114522 /remote/design/service接口可以未鉴权获取源码信息
REPORT-114494 fix:【FR国际化】启动页logo新版本显示中文
REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后,再打开颜色会变为跟随的主题色。且边框线型颜色展示异常
视图树也补一下
REPORT-114524 【控件显示增强-复选按钮组控件】自定义,自定义修改控件背景后会报错
REPORT-114501 【控件显示增强-边框颜色】边框颜色传到前端为null
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
fix: 回退代码 fvs.chart和fvs.ec.chart都不走refresh逻辑 原始问题fvs.ec.chart的邮件使用chartemailpane才没有正文勾选项不通过refresh实现 通过插件DuchampHyperlinkGroup重写实现邮件&联动fvs组件 #REPORT-111618
10 months ago
vito
aee26219b4
Merge branch 'release/11.0' into newui
10 months ago
superman
5916672c76
Merge pull request #13691 in DESIGN/design from final/11.0 to release/11.0
...
* commit '1f74d3b71b0c098de979ac358d9ba0a3ee2d3313':
10 months ago
superman
1f74d3b71b
Merge pull request #13690 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '3d471ebb72c32e090ee1fee08d5311e85ad4f3a4':
10 months ago