dfbb414597
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '35414ec8ab3e1239b282e5cddf2cd9a9f33ce0be':
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
2bcb8161a8
REPORT-113994 fix:修复一些代码质量问题
4 months ago
d97b7eef26
REPORT-113994 fix:修复一下策略配置面板空指针
4 months ago
d001c198ca
Merge remote-tracking branch 'origin/newui' into newui
4 months ago
be064cc5e7
REPORT-127437 feat: UI 翻新
4 months ago
7ef0d14538
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '35414ec8ab3e1239b282e5cddf2cd9a9f33ce0be':
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
649c55cc32
REPORT-113994 【NewUI】设计器样式翻新-启动页
4 months ago
35414ec8ab
Pull request #14279 : REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
...
Merge in DESIGN/design from ~RICHARD.FANG/design:newui to newui
* commit 'fc4d6f26db77061b316ec592f8aa76808d896cdf':
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
97777571ec
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
fc4d6f26db
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
5d17f67177
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
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
4 months ago
5ad2c6b311
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
3b82c7fa22
Merge remote-tracking branch 'origin/newui' into newui
4 months ago
28eede8586
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
b62c339951
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
6689795fef
Pull request #14255 : REPORT-113994 【NewUI】设计器样式翻新-图表
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '462452de1a3dd750797c32d05045364e518b2ad1':
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
462452de1a
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
b0b0dee1e4
Merge branch 'newui' of ssh://code.fineres.com:7999/~renekton/design into newui
4 months ago
105ea14bd1
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '287996fbecd7221fc02187e4675e35f6c4563a3b':
REPORT-113994 feat:TabPane组件实现
REPORT-113994 feat:TabPane组件实现
4 months ago
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组件实现
4 months ago
e3b9ac78c6
报表引擎属性弹窗翻新
4 months ago
4f0a24f5e7
REPORT-113994 feat:TabPane组件实现
4 months ago
9f849586a0
REPORT-113994 feat:TabPane组件实现
4 months ago
6963a13080
报表引擎属性弹窗翻新
4 months ago
1d662d3efb
报表引擎属性弹窗翻新
5 months ago
9c31c6a877
报表引擎属性弹窗翻新
5 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 优化调用性能完善单测
6 months ago
vito
dd7f075f16
REPORT-114888 icon无法找到_disable图标时使用系统默认灰化图
6 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布局应用修复滚动
6 months ago
vito
d1f5f4abfe
REPORT-113994 bugfix: flex布局应用修复滚动
6 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图标损坏
6 months ago
vito
3399f9fdb6
REPORT-113994 fix: bbs图标损坏
6 months ago
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】文件-选项和帮助面板翻新
6 months ago
db6489c34a
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
7 months ago
36a50e6176
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
7 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. 优化调用性能
7 months ago
vito
2936dc76b5
补充提交
7 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
7 months ago
vito
f2c8761693
REPORT-114888 feat: 图标管理器优化
...
1. 支持png注册
2. 支持查找旧版图标
3. 新图标配置文件注册方式
3. 优化调用性能
7 months ago
84200c3081
Pull request #13942 : REPORT-111997 NewUI 修改按钮布局
...
Merge in DESIGN/design from ~LEO.QIN/design:newui to newui
* commit '5985e677da559d734668a22daa8c12793faf2ee4':
REPORT-111997 NewUI 修改按钮样式
7 months ago
5985e677da
Merge remote-tracking branch 'origin/newui' into newui
7 months ago
de85a0815d
REPORT-111997 NewUI 修改按钮样式
7 months ago
299995f71b
Pull request #13941 : REPORT-111995 【NewUI】修复测试验收问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '7d717e353c6b73c05c24a0fc6a7d6069de4253b4':
REPORT-111995 【NewUI】修复测试验收问题
7 months ago
7d717e353c
REPORT-111995 【NewUI】修复测试验收问题
7 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栏右键弹窗显示异常
7 months ago
Renekton-张世豪
lemon
Levy.Xie-解安森
Richard.Fang-方超
张世豪
vito-刘恒霖
Leo.Qin-覃宇攀