fly.li
b1b6c8cf7c
REPORT-59567:修改代码格式
3 years ago
fly.li
84c27e70b7
REPORT-59567:修改代码格式
3 years ago
fly.li
6a99c142cd
REPORT-59567:修改报表引擎属性界面一些与交互不同的地方
3 years ago
fly.li
998bc46dd7
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
fly.li
1a76f5d73b
REPORT-59567:修改报表引擎属性界面一些与交互不同的地方
3 years ago
starryi
c306b900f1
Pull request #6077 : REPORT-57806 主题获取
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-57806 to feature/x
* commit '407df3dd184fd8625717f17a88443d5f77f844c7':
REPORT-57806 主题获取
3 years ago
fanglei
5ec6c09ebe
Pull request #6046 : REPORT-59952&REPORT-60057&REPORT-60139 解决打开空白模板和布局模板有差异的一类问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit 'b4abd422c9aee5195b9819c94fb8b71019a3521a':
REPORT-59952&REPORT-60057&REPORT-60139 解决pr中的问题
REPORT-59952&REPORT-60057&REPORT-60139 解决pr中的问题
REPORT-59952&REPORT-60057&REPORT-60139 解决打开空白模板和布局模板有差异的一类问题
3 years ago
Tommy
2eab975ce0
Pull request #6079 : REPORT-57813 更新最新两个场景跑通测试用例
...
Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x
* commit 'f57e804602c666e5f3e9e2df5b8970e4e7649c71':
REPORT-57813 埋点方法分离
REPORT-57813 完成提示更换
REPORT-57813 完成提示更换
REPORT-57813 更新最新两个场景跑通测试用例
3 years ago
kuangshuai
f57e804602
REPORT-57813 埋点方法分离
3 years ago
kuangshuai
6b5c66b53b
REPORT-57813 完成提示更换
3 years ago
kuangshuai
144f440307
REPORT-57813 完成提示更换
3 years ago
kuangshuai
78ee0148e0
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
a6d299d3a6
REPORT-57813 更新最新两个场景跑通测试用例
3 years ago
Starryi
407df3dd18
REPORT-57806 主题获取
...
【问题原因】
把弹窗按钮交互分离出来
【改动思路】
同上
3 years ago
kerry
40608c1b69
Pull request #6059 : REPORT-60012 主题管理-编辑主题-预览界面国际化
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '949b249bbf7ff9e298d1ce879e8d61315812691b':
国际化 key 值修改
REPORT-60313【开发者预览支持调整模板布局】新自适应-没在目录里的模板直接设计器打开后开发者调试预览,触发保存会失败
魔鬼数字
REPORT-60012 主题管理-编辑主题-预览界面国际化
3 years ago
kerry
949b249bbf
国际化 key 值修改
3 years ago
Fly.Li
10044c8f42
Pull request #6075 : REPORT-59567:屏蔽显示数据总数选项
...
Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x
* commit '64e9cc08918239326b2ffacab40a2d4352a30a17':
REPORT-59567:屏蔽显示数据总数选项
3 years ago
fly.li
64e9cc0891
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
fly.li
44af52124a
REPORT-59567:屏蔽显示数据总数选项
3 years ago
kerry
4906987ea7
REPORT-60313【开发者预览支持调整模板布局】新自适应-没在目录里的模板直接设计器打开后开发者调试预览,触发保存会失败
3 years ago
superman
59bd2c6280
Merge pull request #6071 in DESIGN/design from feature/10.0 to feature/x
...
* commit '227057415e837b1663fb4ba8c6f4501b20e5081e':
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
3 years ago
Fly.Li
3ed5fff7ed
Pull request #6064 : REPORT-59567 & REPORT-59524 & REPORT-59520 & REPORT-59737 & REPORT-59706
...
Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x
* commit 'e43bedb410ee0ac7a9b39ebefe6dad2531bb23e3':
REPORT-59567:报表引擎属性面板按交互修改
REPORT-59567:修改代码不规范的地方
REPORT-59567:将长方法拆分
解决冲突·
解决冲突
解决冲突
REPORT-59567:报表引擎属性面板按交互修改
REPORT-59567:报表引擎界面按交互修改
解决冲突
解决冲突
REPORT-59520:删除cptx与cpt转换按钮以及删除文件菜单中的批量格式转换按钮
解决冲突
解决冲突
REPORT-59524:删除误导入的文件
REPORT-59724:修改成默认选中新计算引擎选项以及顺便修改一下报表引擎属性类相关属性命名不规范的地方
REPORT-59706:有不支持功能时,日志里面的提示语句需要修改一下
REPORT-59737:修复另存为流程中出现文件默认名未xxx.cptx.cpt的bug
REPORT-59520:删除转换按钮和文件菜单中的批量格式转换菜单
REPORT-59524:另存为流程中删除cptx选项
3 years ago
fly.li
e43bedb410
REPORT-59567:报表引擎属性面板按交互修改
3 years ago
方磊
b4abd422c9
REPORT-59952&REPORT-60057&REPORT-60139 解决pr中的问题
3 years ago
fly.li
3a3e3ca8d9
REPORT-59567:修改代码不规范的地方
3 years ago
fly.li
a356dd8471
REPORT-59567:将长方法拆分
3 years ago
方磊
1f797aaf24
REPORT-59952&REPORT-60057&REPORT-60139 解决pr中的问题
3 years ago
kerry
fcc2f1c898
魔鬼数字
3 years ago
fly.li
3da1538a8a
解决冲突·
3 years ago
fly.li
317dfa8523
解决冲突
3 years ago
fly.li
97160bd3d0
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
fly.li
dc45727780
解决冲突
3 years ago
fly.li
cdc3d11b69
REPORT-59567:报表引擎属性面板按交互修改
3 years ago
Fly.Li
7c9d7592ba
Merging in latest from upstream (DESIGN/design:refs/heads/feature/x)
...
* commit 'c41bb1c3fcdc2b986d364d2691cfe8a0b94d72ac':
REPORT-57813 遗漏代码
REPORT-57813 部分门槛问题
REPORT-57813 修改部分门槛用例发现的问题
更新下布局模板
REPORT-59906【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件,拖入到占位块后,整体缩小了,但里面的子组件没有等比例缩小
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
REPORT-57806 主题获取
REPORT-59858 引导页场景开发
REPORT-59629 引导页框架
3 years ago
Tommy
c41bb1c3fc
Pull request #6060 : REPORT-57813 修改部分门槛用例发现的问题
...
Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x
* commit 'd664ad5a1e74768de4c67ec2c1761f98cbe6dab1':
REPORT-57813 遗漏代码
REPORT-57813 部分门槛问题
REPORT-57813 修改部分门槛用例发现的问题
3 years ago
fly.li
57e2141894
REPORT-59567:报表引擎界面按交互修改
3 years ago
kuangshuai
d664ad5a1e
REPORT-57813 遗漏代码
3 years ago
kuangshuai
a22c7c0132
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
9d32667138
REPORT-57813 部分门槛问题
3 years ago
fly.li
5714570bad
解决冲突
3 years ago
kerry
7eefd96056
REPORT-60012 主题管理-编辑主题-预览界面国际化
3 years ago
kerry
27ecb2831a
Pull request #6030 : REPORT-59906 && REPORT-60158 【固定布局-原布局推荐4.1】决策报表-固定布局下往绝对画布块上拖的时候效果不对;【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件,拖入到占位块后,整体缩小了,但里面的子组件没有等比例缩小
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'a1bb9bc52de1b777de11ad96ae28716b23960222':
更新下布局模板
REPORT-59906【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件,拖入到占位块后,整体缩小了,但里面的子组件没有等比例缩小
3 years ago
starryi
4c9e220974
Pull request #5982 : REPORT-57806 主题获取
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-57806 to feature/x
* commit 'b1b583d34fe2f26c9a748869ef720ec775e5df28':
REPORT-57806 主题获取
3 years ago
kuangshuai
5f6ebc6422
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
zheng
227057415e
Pull request #6048 : CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'd90c98588357b97d26dfa52b26e711b309c9ec51':
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
3 years ago
superman
21eae78836
Merge pull request #6055 in DESIGN/design from feature/10.0 to feature/x
...
* commit '9b7f720b36e49d3e3778c8bb1ac66047e0a6658b':
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
superman
9b7f720b36
Merge pull request #6052 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1857733955f72a2073d621247e495d65a9e79542':
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
Lucian.Chen
1857733955
Pull request #6029 : REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit 'cc19c999e3fa7c27929d108ca6b75406b1df8f37':
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
kuangshuai
41cf51ba1a
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
dbf6e41c51
REPORT-57813 修改部分门槛用例发现的问题
3 years ago