Fly.Li
53ee93c8ea
Merging in latest from upstream (DESIGN/design:refs/heads/feature/x)
...
* commit 'd3fd97dc0e55d09157492cbbe991a82d68a032d8':
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-60077 删除本地性能分析菜单项
3 years ago
shine
d90c985883
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
b7fae76db7
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
3 years ago
pengda
d3fd97dc0e
Pull request #6047 : REPORT-58039 支持固定行数分页
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit 'fab2c94ade321a4512def20efef1bbc4564031d1':
REPORT-58039 支持固定行数分页
3 years ago
pengda
fab2c94ade
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
4dc13ed1ad
REPORT-58039 支持固定行数分页
3 years ago
pengda
68af92ad7d
Pull request #6006 : REPORT-58039 支持固定行数分页
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit 'f06c05029798e468edc15d9c45350dafd5f66ea5':
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
REPORT-58039 支持固定行数分页
3 years ago
方磊
ab7298f13f
REPORT-59952&REPORT-60057&REPORT-60139 解决打开空白模板和布局模板有差异的一类问题
3 years ago
kerry
a1bb9bc52d
更新下布局模板
3 years ago
superman
803ec21fd0
Merge pull request #6045 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f726f1ba106729aca49714a0c7a9b1aae51be2e4':
REPORT-60077 删除本地性能分析菜单项
3 years ago
fly.li
9d8b68ca72
解决冲突
3 years ago
fly.li
30a736ad9d
REPORT-59520:删除cptx与cpt转换按钮以及删除文件菜单中的批量格式转换按钮
3 years ago
kerry
20978231b8
REPORT-59906【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件,拖入到占位块后,整体缩小了,但里面的子组件没有等比例缩小
3 years ago
fly.li
9194a041bb
解决冲突
3 years ago
fly.li
5253c81482
解决冲突
3 years ago
fly.li
dd569c8a57
解决冲突
3 years ago
fly.li
5c0fb5b8ad
REPORT-59524:删除误导入的文件
3 years ago
fly.li
a79d9c929f
REPORT-59724:修改成默认选中新计算引擎选项以及顺便修改一下报表引擎属性类相关属性命名不规范的地方
3 years ago
fly.li
8dbd24bdea
REPORT-59706:有不支持功能时,日志里面的提示语句需要修改一下
3 years ago
fly.li
9bdf356546
REPORT-59737:修复另存为流程中出现文件默认名未xxx.cptx.cpt的bug
3 years ago
fly.li
51c7820619
REPORT-59520:删除转换按钮和文件菜单中的批量格式转换菜单
3 years ago
fly.li
290f29dbbd
REPORT-59524:另存为流程中删除cptx选项
3 years ago
lucian
cc19c999e3
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
loy
f726f1ba10
Pull request #6005 : REPORT-60077 删除本地性能分析菜单项
...
Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0
* commit '89a488e37366e9fd20d6e7ed3a34198cab3cbaa0':
REPORT-60077 删除本地性能分析菜单项
3 years ago
pengda
f06c050297
REPORT-58039 支持固定行数分页
3 years ago
pengda
8bf479c0d4
REPORT-58039 支持固定行数分页
3 years ago
pengda
f8074f545c
REPORT-58039 支持固定行数分页
3 years ago
superman
ee87f640dc
Merge pull request #6018 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e98af599cd982df89c83545d6397ce71d050cd08':
REPORT-56481 修正错误
REPORT-56481 决策报表-模板打开时一直弹出提醒
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
REPORT-59770 【主题切换】编辑主题时,主题配色修改以后,细节配置和整体预览里的颜色没有相应联动
3 years ago
superman
e98af599cd
Merge pull request #6017 in DESIGN/design from final/11.0 to release/11.0
...
* commit '6ba243a75252fda49bc5d33b20edfe840f3f125e':
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
REPORT-59770 【主题切换】编辑主题时,主题配色修改以后,细节配置和整体预览里的颜色没有相应联动
3 years ago
superman
6ba243a752
Merge pull request #6016 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'de53744add24f1a2ef6725f2407bba965c62c04e':
REPORT-59770 【主题切换】编辑主题时,主题配色修改以后,细节配置和整体预览里的颜色没有相应联动
3 years ago
ju|剧浩宇
8637e9b245
Pull request #6015 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from zheng-1632710859332 to feature/x
* commit '5f263e4d9517862f2eded81584b108bbd9c70d74':
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
REPORT-60004 远程设计-保存弹窗 目录显示问题
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
REPORT-57551 设计器显示,自适应布局下body背景设置以后,画布中没有实时显示背景
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
zheng
5f263e4d95
Fixed merge conflict
3 years ago
superman
6217c56855
Merge pull request #6010 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '159e071708da5229a675642e7b144c979a83f97d':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
superman
159e071708
Merge pull request #6009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1f8bd7a1d6f90d714a8d1520586e39677b959b60':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
pengda
5f6f736441
REPORT-58039 支持固定行数分页
3 years ago
Starryi
b1b583d34f
REPORT-57806 主题获取
...
【问题原因】
1. 实现在线共享组件/组件包的新弹窗界面
2. 实现组件包封面右键按钮列表
3. 共享组件模块中下载和应用主题埋点
【改动思路】
同上
3 years ago
loy
89a488e373
REPORT-60077 删除本地性能分析菜单项
3 years ago
eason
acf2e8c978
Pull request #5981 : CHART-20411 适配 大屏模板 文件菜单
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '77c7a84eecde096651e1822302db51d47f79ed8e':
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
3 years ago
shine
77c7a84eec
和抽之前完全一样
3 years ago
Hades
1f8bd7a1d6
Pull request #5979 : REPORT-60004 远程设计-保存弹窗 目录显示问题
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '71c15a84accd64ae515f8a3ff217758b123b989c':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
kuangshuai
df61749157
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
3c26616dbe
REPORT-59858 引导页场景开发
3 years ago
kuangshuai
d9dbfb3db1
REPORT-59629 引导页框架
3 years ago
shine
291452a0f5
CHART-21076 清楚磁盘缓存
3 years ago
shine
236125c553
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
fanglei
c5df6da3fb
Pull request #5980 : 无JIRA任务 还原一也是无JIRA任务的改动
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit '32e6708bc3f6175435f530ead0fbe5b312567ec2':
无JIRA任务 还原一也是无JIRA任务的改动
3 years ago
方磊
32e6708bc3
无JIRA任务 还原一也是无JIRA任务的改动
3 years ago
fanglei
82ecbcabb5
Pull request #5976 : REPORT-59905&REPORT-59952 若干bug
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit 'c971e997fb1e2d2dff3367a435b1aa19faac0321':
REPORT-59952 还原代码
REPORT-59952&无JIRA任务 还原代码&click事件感觉用起来不舒服,鼠标点下释放位置偏离一点点就失灵了,改成press事件
REPORT-59905&REPORT-59952 若干bug
3 years ago
方磊
c971e997fb
REPORT-59952 还原代码
3 years ago
方磊
9b73a2fab6
REPORT-59952&无JIRA任务 还原代码&click事件感觉用起来不舒服,鼠标点下释放位置偏离一点点就失灵了,改成press事件
3 years ago