neil
|
bc36de71e7
|
冲突
|
9 years ago |
xiaxiang
|
12854bf860
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/ba/design
|
9 years ago |
xiaxiang
|
84d3c5761b
|
rt
|
9 years ago |
superman
|
febb4388f7
|
Merge pull request #156 in BA/design from ~NEIL/design:master to master
* commit 'c68ec12df0cf1f9e519056a8fb9b3eb45e418cf5':
冲突修正
|
9 years ago |
neil
|
c68ec12df0
|
冲突修正
|
9 years ago |
superman
|
9fe0e839ae
|
Merge pull request #155 in BA/design from ~NEIL/design:release to master
* commit 'ea3f19be1e9faf42e512fb6d285e11853590f24a': (31 commits)
冲突
冲突
1
1
冲突
滚动条
远程设计插件加载解耦
远程设计插件加载
bug:96398 设计器国际化问题
填报属性抽取通用属性接口,定时器依赖填报
校验改进
校验引擎部分继续改进
填报校验改进,designer暂时依赖engine-write
update
重新初始化列名
打開多種佈局方式
自定义校验接口
自定义校验接口
对接打包
缩放属性面板
...
|
9 years ago |
neil
|
ea3f19be1e
|
冲突
|
9 years ago |
neil
|
565b8edc82
|
冲突
|
9 years ago |
neil
|
2268279e67
|
1
|
9 years ago |
neil
|
c92548a5dd
|
1
|
9 years ago |
neil
|
41c53ab8ca
|
冲突
|
9 years ago |
xiaxiang
|
8c3ec2c705
|
rt
|
9 years ago |
superman
|
4cdd6f3344
|
Merge pull request #151 in BA/design from ~GARYTU/design:master to master
* commit '25c0b3d731968548003dfe2c2ad2f0c3aecca0da':
代码质量
灰化已实现~效果还不错哈~
|
9 years ago |
Lee
|
25c0b3d731
|
代码质量
|
9 years ago |
Lee
|
fe3acd8736
|
灰化已实现~效果还不错哈~
|
9 years ago |
superman
|
f14a210efd
|
Merge pull request #149 in BA/design from ~NEIL/design:master to master
* commit 'a1ed78437965dce1e79454103cbd5c5b4f04a926':
1
1
韩文设计器按钮撑开.
|
9 years ago |
neil
|
a1ed784379
|
1
|
9 years ago |
neil
|
ef253ee9fb
|
1
|
9 years ago |
neil
|
7b9331d99b
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
9 years ago |
neil
|
4a2e3bd52f
|
韩文设计器按钮撑开.
|
9 years ago |
superman
|
2547c57c95
|
Merge pull request #147 in BA/design from ~SHINE/design:dev to dev
* commit 'bd24e58a8c7a67672d704d49746ee1683ca61754':
滚动条
|
9 years ago |
superman
|
3c33e65201
|
Merge pull request #142 in BA/design from ~GARYTU/design:master to master
* commit '3449016840c30f15809288f55099bccc9a6921fa':
提示框简化,更简洁了
1. 重写了自己的model来在set属性值之前进行判断并给出弹窗提示; 2. 继承DoubleEditor来实现兼容弹窗显示效果的控件,复原之前基础控件的所有更改。
基础控件类抽取需要的代码单独作一个方法,在子类中重写
重载输入框的光标事件方法,不管是光标移出还是按下回车(enter),会立即触发表单移动端高度属性的setter方法,并给出弹窗提示。
|
9 years ago |
Lee
|
3449016840
|
提示框简化,更简洁了
|
9 years ago |
fr_shine
|
bd24e58a8c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~shine/design into dev
|
9 years ago |
fr_shine
|
8fbe2ac5c2
|
滚动条
|
9 years ago |
Lee
|
93c676528f
|
1. 重写了自己的model来在set属性值之前进行判断并给出弹窗提示;
2. 继承DoubleEditor来实现兼容弹窗显示效果的控件,复原之前基础控件的所有更改。
|
9 years ago |
superman
|
0bda99e71c
|
Merge pull request #146 in BA/design from ~VITO/design:dev to dev
* commit 'f741aad4a49b9988c848b3d22ee4dcd466677d81':
远程设计插件加载解耦
|
9 years ago |
vito
|
f741aad4a4
|
远程设计插件加载解耦
|
9 years ago |
superman
|
d21bf9293f
|
Merge pull request #145 in BA/design from ~VITO/design:dev to dev
* commit '0c800b780e2705328e3036268006d1ff47a4bedf':
远程设计插件加载
|
9 years ago |
vito
|
0c800b780e
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~vito/design into dev
|
9 years ago |
vito
|
c29cf4f5f1
|
远程设计插件加载
|
9 years ago |
superman
|
56e977e92d
|
Merge pull request #143 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'ad277d320f4258f79f668be97da4fe8e03f1f543':
bug:96398 设计器国际化问题
|
9 years ago |
superman
|
0955d284ec
|
Merge pull request #144 in BA/design from ~XIAOHU/design:master to master
* commit '22f15fc5f3572487492b9040e4957a6ccf4fcd59':
dev->master
|
9 years ago |
xiaohu
|
22f15fc5f3
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~xiaohu/design
|
9 years ago |
xiaohu
|
5ebadf7e29
|
dev->master
|
9 years ago |
zhouping
|
ad277d320f
|
bug:96398 设计器国际化问题
|
9 years ago |
Lee
|
758e1f73ad
|
基础控件类抽取需要的代码单独作一个方法,在子类中重写
|
9 years ago |
Lee
|
75ecd607cd
|
重载输入框的光标事件方法,不管是光标移出还是按下回车(enter),会立即触发表单移动端高度属性的setter方法,并给出弹窗提示。
|
9 years ago |
superman
|
fd851c7a87
|
Merge pull request #141 in BA/design from ~RICHIE/design:dev to dev
* commit '32b1444a8943e0f68c3efb98cc39b499a4d7bf8c':
填报属性抽取通用属性接口,定时器依赖填报
校验改进
校验引擎部分继续改进
|
9 years ago |
richie
|
32b1444a89
|
填报属性抽取通用属性接口,定时器依赖填报
|
9 years ago |
superman
|
c48e409e57
|
Merge pull request #140 in BA/design from ~GARYTU/design:master to master
* commit '48110e51de7d7f3179f00e5705c06d6dbcf57b1e':
class重命名
表单body属性面板,在事件右边增加“移动端属性”,然后把手机重布局移到移动端属性面板里面。 这个花的时间较多,主要是整个代码结构都不太一样了,熟悉了好久。。
|
9 years ago |
Lee
|
48110e51de
|
class重命名
|
9 years ago |
richie
|
b7a6beeb20
|
校验改进
|
9 years ago |
Lee
|
d76e2e27a0
|
表单body属性面板,在事件右边增加“移动端属性”,然后把手机重布局移到移动端属性面板里面。
这个花的时间较多,主要是整个代码结构都不太一样了,熟悉了好久。。
|
9 years ago |
richie
|
b822003c7b
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 years ago |
richie
|
7f35d16073
|
校验引擎部分继续改进
|
9 years ago |
superman
|
a9485dda33
|
Merge pull request #139 in BA/design from ~RICHIE/design:dev to dev
* commit '8ef2ea935c62eea663b3ce7e29112587390803de':
填报校验改进,designer暂时依赖engine-write
|
9 years ago |
richie
|
8ef2ea935c
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 years ago |
richie
|
9763c1be29
|
填报校验改进,designer暂时依赖engine-write
|
9 years ago |
superman
|
38ff516481
|
Merge pull request #138 in BA/design from ~XIAOHU/design:dev to dev
* commit 'b6935458f585bcb44ab2919453434c38554d8cc6':
update
重新初始化列名
|
9 years ago |