rinoux
|
b851de1e5f
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '21cf2b783d5f105bf4473853d9f1fabb0daf58f9':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
MoMeak
|
2a10cb199f
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
7173e76d4c
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
plough
|
57954b2e8b
|
REPORT-3163 合作开发9.0设计器=>propertyItemList 改为 propertyItemMap(有序map)
|
7 years ago |
plough
|
64474ba905
|
REPORT-3163 合作开发9.0设计器=>所有tab弹出后,显示“无可用配置项”
|
7 years ago |
plough
|
abba216587
|
REPORT-3163 合作开发9.0设计器=>交换弹出工具条的上下按钮
|
7 years ago |
plough
|
a914c62961
|
REPORT-3163 合作开发9.0设计器=>红色标出可拖动区域
|
7 years ago |
plough
|
1d44dc94db
|
REPORT-3163 合作开发9.0设计器=>面板标题国际化
|
7 years ago |
plough
|
c5e83b3b13
|
REPORT-3163 合作开发9.0设计器=>修复弹窗bug:1、失焦后被设计器覆盖;2、弹出后,点击不同单元格,面板没有更新;3、弹出后,点击不同单元格,弹回,面板消失;4、切换面板时,内容不应被遮挡
|
7 years ago |
superman
|
21cf2b783d
|
Merge pull request #999 in BA/design from ~NEIL/design:9.0 to 9.0
* commit 'e2790a4cc8ffb16c10998e2b0343c88c4d70ef19':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
neil
|
e2790a4cc8
|
utf8
|
7 years ago |
neil
|
1aceeba735
|
REPORT-1013 用log4j记录日志.
|
7 years ago |
plough
|
caa4bcbfcd
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
plough
|
e5c2b0afd8
|
REPORT-3163 合作开发9.0设计器=>弹出对话框可调整高度
|
7 years ago |
plough
|
4eda8b5566
|
REPORT-3163 合作开发9.0设计器=>调整固定弹窗的界面
|
7 years ago |
MoMeak
|
e9d400ca4e
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
37459e61bc
|
rollback编译不通过的注释代码
|
7 years ago |
MoMeak
|
73a01b1730
|
缩放条panel
|
7 years ago |
plough
|
dadb31b82e
|
REPORT-3163 合作开发9.0设计器=>可弹出、弹入对话框;限制对话框可移动区域
|
7 years ago |
plough
|
0a9708d434
|
REPORT-3163 合作开发9.0设计器=>弹出对话框可拖动
|
7 years ago |
plough
|
6ee7cee671
|
REPORT-3163 合作开发9.0设计器=>弹出对话框的初步代码;调整弹入、弹出工具条
|
7 years ago |
superman
|
223fd2715a
|
Merge pull request #41 in PF/design from ~LOY/design_pf:9.0 to 9.0
* commit 'eb852ef3cf94526803d7c1ffd0d45b4af1ed8428':
新填报按钮国际化
添加新填报预览按钮
|
7 years ago |
superman
|
15e63fb0e1
|
Merge pull request #998 in BA/design from ~NEIL/design:master to master
* commit 'cae51e136d9281928fa897dbf26c6408f3a98888':
1
1
REPORT-2825 合代码验收bug
|
7 years ago |
neil
|
cae51e136d
|
1
|
7 years ago |
neil
|
48cfd19b21
|
1
|
7 years ago |
neil
|
d155146179
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
7 years ago |
neil
|
1164a17f0c
|
REPORT-2825 合代码验收bug
|
7 years ago |
loy
|
eb852ef3cf
|
新填报按钮国际化
|
7 years ago |
loy
|
c468467562
|
Merge branch 'write' into 9.0
|
7 years ago |
superman
|
21b2255e0a
|
Merge pull request #997 in BA/design from ~NEIL/design:master to master
* commit '357d6c82db8c88ffa07d40169ccf8694fcfe33c6':
REPORT-3281 合代码验收问题, 日文加载失败.
|
7 years ago |
neil
|
357d6c82db
|
REPORT-3281 合代码验收问题, 日文加载失败.
|
7 years ago |
richie
|
ac96717cb3
|
修改拼写错误
|
7 years ago |
plough
|
0569a1ff26
|
REPORT-3163 合作开发9.0设计器=>属性面板收起状态时,点击竖向tab,弹出属性面板
|
7 years ago |
superman
|
80ea92e98c
|
Merge pull request #996 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0
* commit 'b2db63a2138b654a3695118cefa1f275bbaf60c4':
PFC-607 插件安装删除更新不重启支持 解决SandboxCollection,不关闭插件就无法GC相关对象的问题。改成了在内部类中只保存一个ID,不引用具体的对象。
|
7 years ago |
juhaoyu
|
b2db63a213
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
juhaoyu
|
19303658da
|
PFC-607 插件安装删除更新不重启支持
解决SandboxCollection,不关闭插件就无法GC相关对象的问题。改成了在内部类中只保存一个ID,不引用具体的对象。
|
7 years ago |
richie
|
cdc5671737
|
拼错了,改进下
|
7 years ago |
richie
|
16cdd1cfb9
|
拼错了,改动
|
7 years ago |
superman
|
ffe3bdd870
|
Merge pull request #994 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'c0db4cda40d8ee0b0e6b1ebe1ee1f70f7a3f7c25':
placeholder改错了
|
7 years ago |
XiaXiang
|
c0db4cda40
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
7 years ago |
XiaXiang
|
fc07b767bb
|
placeholder改错了
|
7 years ago |
plough
|
d6d632aedc
|
REPORT-3163 合作开发9.0设计器=>使用UIButton作为竖向tab的按钮
|
7 years ago |
plough
|
1024f5c230
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
MoMeak
|
85de7e3212
|
rollback编译不通过的注释代码
|
7 years ago |
plough
|
4659e8e312
|
REPORT-3163 合作开发9.0设计器=>初步合并外框架代码
|
7 years ago |
superman
|
e3f5b840b2
|
Merge pull request #991 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'ed95b49e463a51592e29221111ab428e74e72baf':
国际化
加一条分割线
alphafine 选中状态的交互修改
|
7 years ago |
XiaXiang
|
ed95b49e46
|
国际化
|
7 years ago |
XiaXiang
|
1bcd8be952
|
加一条分割线
|
7 years ago |
XiaXiang
|
b097c6033d
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
7 years ago |
XiaXiang
|
3921acd85e
|
alphafine 选中状态的交互修改
|
7 years ago |