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 |
|
hzzz
|
2150be4841
|
hzzzzzzzzzz
|
7 years ago |
|
superman
|
237a0b4fe2
|
Merge pull request #1042 in BA/design from ~PLOUGH/design:9.0 to 9.0
* commit '55a8361b01b41febfbcee8d7b8b1c0b7dded9a21':
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设计器=>聚合报表=》坐标尺寸
|
7 years ago |
plough
|
55a8361b01
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》代码规范
|
7 years ago |
|
yaoh.wu
|
35ce0a2ad0
|
REPORT-3348 富文本，图片，斜线，子报表面板修改；公式，文本编辑器拆分
|
7 years ago |
|
yaoh.wu
|
2e96d8303c
|
REPORT-3348 可扩展性触发保存
|
7 years ago |
|
yaoh.wu
|
fb6f0d20c4
|
REPORT-3348 自定义值公式输入框触发保存
|
7 years ago |
|
yaoh.wu
|
8ccc9e0696
|
REPORT-3348 结果集筛选 公式输入框触发保存
|
7 years ago |
|
yaoh.wu
|
7289f93467
|
REPORT-3348
动态参数注入触发保存，高级设置排列顺序触发保存,结果集筛选触发保存
|
7 years ago |
|
plough
|
bdd70c5bfd
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》点击报表块内的单元格时，替换控件设置tab页
|
7 years ago |
|
plough
|
c6acdb681d
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》去掉无用import
|
7 years ago |
|
plough
|
cca91e4f59
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》国际化；边距调整
|
7 years ago |
|
plough
|
c987fc5cd2
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》控件名称面板
|
7 years ago |
|
plough
|
69a6fea2fe
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》坐标尺寸
|
7 years ago |
|
MoMeak
|
28a41ef8af
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
|
hzzz
|
6d57f673f7
|
tree background
|
7 years ago |
|
kerry
|
df65a17ef8
|
代码上传
|
7 years ago |
|
kerry
|
48fa3b74ba
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit 'd48d3ec615d148c0e15f48bf50c9a09fc8ffddf1':
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉微调
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉优化
|
7 years ago |
|
kerry
|
fdd52d598d
|
解决冲突
|
7 years ago |
|
juhaoyu
|
4f91354d78
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
|
kerry
|
2bbe2d14fa
|
解决冲突
|
7 years ago |
|
superman
|
d48d3ec615
|
Merge pull request #1038 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit '313325ee45e5e2d16e5df9d5ddad80e2fd2617c8':
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉微调
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 去掉空格，放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉优化
|
7 years ago |
|
kerry
|
6e01b5ed16
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
|
kerry
|
9f57df842e
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
|
MoMeak
|
313325ee45
|
REPORT-2897 9.0设计器修改
去掉空格，放个空的uilabel做对齐
|
7 years ago |
|
hzzz
|
c7f613318e
|
fix
|
7 years ago |
|
hzzz
|
d1bdc77824
|
Merge branch '9.0' into design
|
7 years ago |
|
MoMeak
|
93220b02f2
|
REPORT-2897 9.0设计器修改
视觉微调
|
7 years ago |
|
MoMeak
|
ac440dfd22
|
REPORT-2897 9.0设计器修改
去掉空格，放个空的uilabel做对齐
|
7 years ago |
|
MoMeak
|
9ef203c6a6
|
REPORT-2897 9.0设计器修改
去掉空格，放个空的uilabel做对齐
|
7 years ago |
|
hzzz
|
a5b5311004
|
REPORT-3410
|
7 years ago |
|
MoMeak
|
d6b49cea15
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
|
kerry
|
e0c965f5ea
|
Merge pull request #1036 in BA/design from ~KERRY/design:9.0 to 9.0
* commit 'a98db3ce166ba130981fd12165bc235300e1f895':
提交国际化
解决冲突
REPORT-3293 界面各个控件调整
代码修改
国际化
国际化
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
|
kerry
|
a98db3ce16
|
提交国际化
|
7 years ago |
|
kerry
|
7cca6865bd
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit 'ad27fd390e210c511b13e6b97785615ebceb3260':
REPORT-3163 合作开发9.0设计器=>组件库tab页
REPORT-3163 合作开发9.0设计器=>参数面板=》调整工具条背景色
REPORT-3163 合作开发9.0设计器=>整理代码
REPORT-3163 合作开发9.0设计器=>参数面板=》完善功能，调整界面
REPORT-3163 合作开发9.0设计器=>参数面板=》实现基本交互
REPORT-3163 合作开发9.0设计器=>界面微调
REPORT-3163 合作开发9.0设计器=>聚合报表=》修改逻辑，正确显示tab项
REPORT-3163 合作开发9.0设计器=>列表面板=》替换选中状态下的编辑按钮图标
|
7 years ago |
