obo
9bd58a8c0d
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
4 months ago
obo
1b38062b18
REPORT-125641 fix:设计器显示问题-英语显示不全
4 months ago
renekton
abec5c347c
控件管理/报表填报属性/超级链接/服务器参数
4 months ago
renekton
f93300d87f
Merge branch 'newui' of ssh://code.fineres.com:7999/~renekton/design into newui
...
# Conflicts:
# build.gradle
4 months ago
Renekton-张世豪
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
lemon
2bcb8161a8
REPORT-113994 fix:修复一些代码质量问题
4 months ago
lemon
d97b7eef26
REPORT-113994 fix:修复一下策略配置面板空指针
4 months ago
lemon
d001c198ca
Merge remote-tracking branch 'origin/newui' into newui
4 months ago
lemon
be064cc5e7
REPORT-127437 feat: UI 翻新
4 months ago
Obo-王学仁
d483da7c37
Pull request #14309 : REPORT-128068 fix:设计器按钮显示不全且无tooltips
...
Merge in DESIGN/design from ~OBO/design:final/11.0 to final/11.0
* commit '6986bd0bd6269468fe9b39767e89549adf53c0ba':
REPORT-128068 fix:设计器按钮显示不全且无tooltips
4 months ago
obo
6986bd0bd6
REPORT-128068 fix:设计器按钮显示不全且无tooltips
4 months ago
Levy.Xie-解安森
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
Levy.Xie-解安森
649c55cc32
REPORT-113994 【NewUI】设计器样式翻新-启动页
4 months ago
Richard.Fang-方超
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
Levy.Xie-解安森
97777571ec
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
Richard.Fang
fc4d6f26db
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
Richard.Fang
5d17f67177
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
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
4 months ago
Richard.Fang
5ad2c6b311
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 months ago
Levy.Xie-解安森
3b82c7fa22
Merge remote-tracking branch 'origin/newui' into newui
4 months ago
Levy.Xie-解安森
28eede8586
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
Richard.Fang
b62c339951
REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集
4 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】设计器样式翻新-图表
4 months ago
superman
c6467f11cc
Merge pull request #14262 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'd065d0fc1078d3260b2202b8419a1564160707a2':
4 months ago
superman
d065d0fc10
Merge pull request #14256 in DESIGN/design from release/11.0 to final/11.0
...
* commit '18efcac0f2a2091ff305b275c88024b14a3ce7e2':
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性能监控
4 months ago
Levy.Xie-解安森
462452de1a
REPORT-113994 【NewUI】设计器样式翻新-图表
4 months ago
Levy.Xie-解安森
18efcac0f2
Pull request #14228 : REPORT-127241 & REPORT-127462 fix: 设计器性能埋点字段问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0
* commit '4cff4a2dd7b5e72ad6b4851fb5f4952be7079e75':
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
4 months ago
Richard.Fang-方超
a92bbe33c5
Pull request #14225 : REPORT-125224 fix:补充设计器启动计时器关闭
...
Merge in DESIGN/design from ~RICHARD.FANG/design:release/11.0 to release/11.0
* commit '8cbef9ef05e790eb558e4eef1c61408b500b3c8d':
REPORT-125224 fix:补充设计器启动计时器关闭
4 months ago
superman
74dd2f7c0c
Merge pull request #14223 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'f0eb1a8cad41bb601d2aa307124ae06aa686f379':
4 months ago
Levy.Xie-解安森
4cff4a2dd7
REPORT-111995 【NewUI】文件-选项和帮助面板翻新
4 months ago
Richard.Fang
8cbef9ef05
REPORT-125224 fix:补充设计器启动计时器关闭
4 months ago
Richard.Fang-方超
d930424c5f
Pull request #14213 : REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
...
Merge in DESIGN/design from ~RICHARD.FANG/design:release/11.0 to release/11.0
* commit '5980231c6de2cb0498c56fadbf088202425ed242':
REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
4 months ago
Zhanying-占盈
587ee033ec
Pull request #14205 : REPORT-70155 fix: fvs根据主题样式创建默认单元格 REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit 'ad86fcdb91469123a734187bb38c99ade470e529':
REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
REPORT-70155 fix: fvs根据主题样式创建默认单元格
4 months ago
renekton
b0b0dee1e4
Merge branch 'newui' of ssh://code.fineres.com:7999/~renekton/design into newui
4 months ago
Renekton-张世豪
105ea14bd1
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '287996fbecd7221fc02187e4675e35f6c4563a3b':
REPORT-113994 feat:TabPane组件实现
REPORT-113994 feat:TabPane组件实现
4 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组件实现
4 months ago
renekton
e3b9ac78c6
报表引擎属性弹窗翻新
5 months ago
superman
f0eb1a8cad
Merge pull request #14222 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8e193974a51da4bd7ab34dc48710c9ebea866b1c':
5 months ago
Levy.Xie-解安森
4f0a24f5e7
REPORT-113994 feat:TabPane组件实现
5 months ago
Levy.Xie-解安森
9f849586a0
REPORT-113994 feat:TabPane组件实现
5 months ago
Levy.Xie-解安森
80acabb5dc
Pull request #14209 : REPORT-117002 & REPORT-127241 设计器性能埋点监控
...
Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0
* commit 'edc7184564e6ed125862266152013045a52f156c':
REPORT-127241 设计器性能埋点字段调整
REPORT-117002 设计器性能埋点监控 调整代码
REPORT-117002 设计器性能埋点监控 调整代码
5 months ago
Richard.Fang
5980231c6d
REPORT-125241 fix:修复模板从内层目录移动到最外层目录时显示异常问题
5 months ago
张世豪
6963a13080
报表引擎属性弹窗翻新
5 months ago
Levy.Xie-解安森
edc7184564
REPORT-127241 设计器性能埋点字段调整
5 months ago
Levy.Xie-解安森
5e915785e1
REPORT-117002 设计器性能埋点监控 调整代码
5 months ago
Levy.Xie-解安森
b05fd1300c
REPORT-117002 设计器性能埋点监控 调整代码
5 months ago
Levy.Xie-解安森
7391ab454c
Pull request #14207 : 无jira 打包问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0
* commit 'c03449b739859c1ab4770d15d12f10037ffd24d7':
无jira 打包问题
5 months ago
Levy.Xie-解安森
c03449b739
无jira 打包问题
5 months ago
Zhanying
ad86fcdb91
REPORT-77878 fix: fvs插件-表格默认字体颜色是白色,但是右键清除单元格格式,字体会变为黑色
5 months ago
Zhanying
23fd4cfd08
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
5 months ago