kerry
|
4778b4b47d
|
代码调整
|
7 years ago |
vito
|
65c38b21d2
|
刚发现添加了一个CellFormulaQuickEditor，这样文字和公式可以分开了
|
7 years ago |
|
vito
|
40a9dda033
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~vito/design into 9.0
# Conflicts:
# designer/src/com/fr/quickeditor/CellQuickEditor.java
# designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java
# designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
# designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
|
7 years ago |
|
kerry
|
6f14be3b1c
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
|
vito
|
9bdc72ad64
|
REPORT-3564 9.0设计器单元格元素插入内容控件
|
7 years ago |
juhaoyu
|
882025d0c4
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
|
juhaoyu
|
e8f048d3fa
|
PFC-607 插件安装删除更新不重启支持
通过动态编译来加密报表
|
7 years ago |
|
kerry
|
a88af0a223
|
代码修改
|
7 years ago |
|
kerry
|
2979836e55
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
plough
|
e32b177d9c
|
REPORT-3163 合作开发9.0设计器=>弹窗=》超级链接=>JavaScript
|
7 years ago |
MoMeak
|
0508d8ffa4
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/ba/design into 9.0
|
7 years ago |
superman
|
d4cb7639c5
|
Merge pull request #1044 in BA/design from ~HZZZ/design:design to 9.0
* commit 'd6432113359ac931084c07a00d522db4189318f9':
icon err
update icon
|
7 years ago |
|
superman
|
10b23d11cd
|
Merge pull request #1047 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit '2269bf41c3dec2b39b7db3f616f83d80f0bcf048':
REPORT-2897 9.0设计器修改 控件设置网页框
REPORT-2897 9.0设计器修改 控件设置网页框
|
7 years ago |
|
MoMeak
|
78edac0667
|
REPORT-2897 9.0设计器修改
控件设置网页框
|
7 years ago |
|
MoMeak
|
2269bf41c3
|
REPORT-2897 9.0设计器修改
控件设置网页框
|
7 years ago |
|
MoMeak
|
532e12987a
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~momeak/design9.0 into 9.0
|
7 years ago |
|
MoMeak
|
f4e24d4031
|
REPORT-2897 9.0设计器修改
控件设置网页框
|
7 years ago |
|
superman
|
0aba6fe258
|
Merge pull request #1046 in BA/design from ~YAOH.WU/design_0407:9.0 to 9.0
* commit '9fd84e024d3116a264beecfc30d874be9cd78c9b':
修改数字结尾命名的变量
找回处理冲突过程中丢失的代码
找回处理冲突过程中丢失的代码
REPORT-3348 公式组件边界对其
REPORT-3348 card layout隐藏时不再显示空白面板
回退一些可能冲突的格式化修改
REPORT-3348 国际化，table layout对齐
REPORT-3348 富文本，图片，斜线，子报表面板修改；公式，文本编辑器拆分
REPORT-3348 可扩展性触发保存
REPORT-3348 自定义值公式输入框触发保存
REPORT-3348 结果集筛选 公式输入框触发保存
REPORT-3348 动态参数注入触发保存，高级设置排列顺序触发保存,结果集筛选触发保存
回退修改
REPORT-3348 修改后触发保存
REPORT-3348 重构，不然不能保存
REPORT-3348 复用添加数据列对话框代码，保留原始对话框布局
REPORT-3348 数据列高级设置内部组件调整
REPORT-3348 单元格元素数据列高级设置
|
7 years ago |
 yaoh.wu
|
9fd84e024d
|
修改数字结尾命名的变量
|
7 years ago |
|
yaoh.wu
|
540db25103
|
找回处理冲突过程中丢失的代码
|
7 years ago |
|
yaoh.wu
|
d3f9566a31
|
找回处理冲突过程中丢失的代码
|
7 years ago |
|
yaoh.wu
|
6c9bdc2be0
|
处理冲突
|
7 years ago |
|
superman
|
a257352c90
|
Merge pull request #1043 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit 'db9ca2ee21f62fadab9aed9c861e848a9d8847b0':
REPORT-2897 9.0设计器修改 修改命名
REPORT-2897 9.0设计器修改 视觉优化
rm button group border
hzzzz
REPORT-2897 9.0设计器修改 视觉优化
hzzzzzzzzzz
REPORT-2897 9.0设计器修改 视觉优化
|
7 years ago |
|
yaoh.wu
|
9341ae0461
|
REPORT-3348 公式组件边界对其
|
7 years ago |
|
yaoh.wu
|
deaed5b5ec
|
REPORT-3348 card layout隐藏时不再显示空白面板
|
7 years ago |
hzzz
|
d643211335
|
icon err
|
7 years ago |
|
superman
|
e82cc1ce35
|
Merge pull request #1045 in BA/design from ~KERRY/design:9.0 to 9.0
* commit '7ad698b5713be6980c7cd242bce12b0f0fa0043f':
REPORT-3293 9.0设计器控件设置重画 删除重复类
|
7 years ago |
|
kerry
|
7ad698b571
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
|
kerry
|
3d12621f62
|
REPORT-3293 9.0设计器控件设置重画 删除重复类
|
7 years ago |
|
MoMeak
|
db9ca2ee21
|
REPORT-2897 9.0设计器修改
修改命名
|
7 years ago |
|
hzzz
|
94d82828ae
|
update icon
|
7 years ago |
|
yaoh.wu
|
aaa3608235
|
回退一些可能冲突的格式化修改
|
7 years ago |
|
yaoh.wu
|
c08fa9a58b
|
国际化冲突
|
7 years ago |
|
yaoh.wu
|
51f89068c4
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '72c8a02c11a486138be98e0a9fcfc956bc6d5305': (36 commits)
merge
代码修改
REPORT-3293 9.0设计器控件设置重画
REPORT-3163 合作开发9.0设计器=>聚合报表=》代码规范
REPORT-3163 合作开发9.0设计器=>聚合报表=》点击报表块内的单元格时，替换控件设置tab页
REPORT-3163 合作开发9.0设计器=>聚合报表=》去掉无用import
REPORT-3163 合作开发9.0设计器=>聚合报表=》国际化；边距调整
REPORT-3163 合作开发9.0设计器=>聚合报表=》控件名称面板
REPORT-3163 合作开发9.0设计器=>聚合报表=》坐标尺寸
tree background
代码上传
解决冲突
解决冲突
REPORT-3293 9.0设计器控件设置重画
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
fix
REPORT-2897 9.0设计器修改 视觉微调
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-3410
...
|
7 years ago |
|
MoMeak
|
880077452f
|
'conflict'
|
7 years ago |
|
MoMeak
|
94b990083a
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
|
yaoh.wu
|
51dceb315f
|
REPORT-3348 国际化，table layout对齐
|
7 years ago |
|
MoMeak
|
77d5a69f3b
|
Merge remote-tracking branch 'origin/hzzz' into 9.0
|
7 years ago |
|
hzzz
|
b0dd758675
|
rm button group border
|
7 years ago |
|
juhaoyu
|
357ba1a65d
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
|
MoMeak
|
10ba03b831
|
Merge remote-tracking branch 'origin/hzzz' into 9.0
|
7 years ago |
|
hzzz
|
576032b7a5
|
hzzzz
|
7 years ago |
|
superman
|
72c8a02c11
|
Merge pull request #1039 in BA/design from ~HZZZ/design:design to 9.0
* commit '3348beae9a980733cf0e5557693736aed5f10367':
merge
tree background
fix
REPORT-3410
|
7 years ago |
|
superman
|
b17dacf401
|
Merge pull request #1040 in BA/design from ~KERRY/design:9.0 to 9.0
* commit 'd61fb93edddf4a086acb365017fef1c9a5b27d6b':
代码修改
REPORT-3293 9.0设计器控件设置重画
代码上传
解决冲突
解决冲突
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
|
hzzz
|
3348beae9a
|
merge
|
7 years ago |
|
MoMeak
|
afb94a8468
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
|
MoMeak
|
161a93c244
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
|
hzzz
|
d876761141
|
merge
|
7 years ago |
|
kerry
|
d61fb93edd
|
代码修改
|
7 years ago |
|
kerry
|
c7644c0dc4
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
