neil
|
7b9331d99b
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
9 years ago |
neil
|
4a2e3bd52f
|
韩文设计器按钮撑开.
|
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 |
Lee
|
93c676528f
|
1. 重写了自己的model来在set属性值之前进行判断并给出弹窗提示;
2. 继承DoubleEditor来实现兼容弹窗显示效果的控件,复原之前基础控件的所有更改。
|
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 |
Lee
|
758e1f73ad
|
基础控件类抽取需要的代码单独作一个方法,在子类中重写
|
9 years ago |
Lee
|
75ecd607cd
|
重载输入框的光标事件方法,不管是光标移出还是按下回车(enter),会立即触发表单移动端高度属性的setter方法,并给出弹窗提示。
|
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 |
Lee
|
d76e2e27a0
|
表单body属性面板,在事件右边增加“移动端属性”,然后把手机重布局移到移动端属性面板里面。
这个花的时间较多,主要是整个代码结构都不太一样了,熟悉了好久。。
|
9 years ago |
superman
|
47f364e563
|
Merge pull request #135 in BA/design from ~GARYTU/design:master to master
* commit '2cae02f227bd81113282f81b067807c2bbf56659':
移动端属性更改到master
|
9 years ago |
Lee
|
2cae02f227
|
移动端属性更改到master
|
9 years ago |
superman
|
aab5f3253b
|
Merge pull request #131 in BA/design from ~NEIL/design:master to master
* commit 'e8cc320b88a0bbd58311a3946f0c1fb6e3ba629c':
24小时传一次
|
9 years ago |
neil
|
e8cc320b88
|
24小时传一次
|
9 years ago |
superman
|
b8c8220117
|
Merge pull request #129 in BA/design from ~NEIL/design:master to master
* commit '7927e18f5855acbbd64ad7ec3299546ee49453f3':
设计器信息收集开启
|
9 years ago |
neil
|
7927e18f58
|
设计器信息收集开启
|
9 years ago |
superman
|
a43d351b45
|
Merge pull request #127 in BA/design from ~ZHOUPING/design:master to master
* commit 'aa18a3ceed09b8c82293126c6b9479287c231e41':
设计器关闭的时候需要调用一下fireServletStopListener,否则本地的平台还原功能没法使
|
9 years ago |
zhouping
|
aa18a3ceed
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~zhouping/design
|
9 years ago |
zhouping
|
982399bdf2
|
设计器关闭的时候需要调用一下fireServletStopListener,否则本地的平台还原功能没法使
|
9 years ago |
superman
|
2cc607e55d
|
Merge pull request #125 in BA/design from ~VITO/design:master to master
* commit '43cf9677adc9f5ca8a7d9a9dce685f0d73416c7f':
使用sitecenter替换所有url
mac下没有encode中文名登陆不上
|
9 years ago |
vito
|
43cf9677ad
|
使用sitecenter替换所有url
|
9 years ago |
vito
|
fd09cd369d
|
mac下没有encode中文名登陆不上
|
9 years ago |
superman
|
65f043cf9c
|
Merge pull request #122 in BA/design from ~NEIL/design:master to master
* commit 'ae681f8dde209c48b46d463c987ce1e15e57f724':
1
1
del
|
9 years ago |
neil
|
ae681f8dde
|
1
|
9 years ago |
neil
|
6256acbb1f
|
1
|
9 years ago |
neil
|
425a6a2962
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
9 years ago |
neil
|
2cb6db5d29
|
del
|
9 years ago |
superman
|
47fcd85422
|
Merge pull request #121 in BA/design from ~EASON/design:master to master
* commit '309943f3ab2c7990b05f3c9468bf0a1c4890434f':
界面
|
9 years ago |
eason-skx
|
309943f3ab
|
界面
|
9 years ago |
superman
|
616141ae3f
|
Merge pull request #120 in BA/design from ~NEIL/design:master to master
* commit '63a5286f07b877a44a9064d1903a0ff53d248f2b':
build failed
|
9 years ago |
neil
|
63a5286f07
|
build failed
|
9 years ago |
superman
|
ac93e76f30
|
Merge pull request #119 in BA/design from release to master
* commit 'a27d9aee82407834f412b35e8daba7c3e01cb72c': (41 commits)
1
1
1
冲突
冲突
old plugin level
api level
rt
无窗口设计
數據配置界面
catch更改
1、删除插件返回一个成功消息,供界面显示 2、更新过期插件弹出两个对话框的问题
d
d
这个入口删掉,不需要做模板数据集分组
web属性界面打不开
给决策平台修改密码和认证等加一个事件监听,剩下的什么删除用户等还没有加
分组插件需要把action开出去
加个参数
地图数据配置界面
...
|
9 years ago |
superman
|
a27d9aee82
|
Merge pull request #118 in BA/design from ~NEIL/design:release to release
* commit '8ce32a4fffdb348e71f7a1d186a62245713b1d5c':
1
1
1
冲突
冲突
1
1
冲突
|
9 years ago |
neil
|
8ce32a4fff
|
1
|
9 years ago |
neil
|
b1c040aff4
|
1
|
9 years ago |
neil
|
b5588b54d3
|
1
|
9 years ago |
neil
|
9e607e097c
|
冲突
|
9 years ago |
neil
|
0df8ff6097
|
冲突
|
9 years ago |
neil
|
7cfec4e5fb
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~neil/design into release
|
9 years ago |
superman
|
0ad5fc8720
|
Merge pull request #114 in BA/design from ~SHINE/design:release to release
* commit 'b7319449ec89b7bcaf117c3573368a577ba7d862':
old plugin level
|
9 years ago |
fr_shine
|
b7319449ec
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~shine/design into release
|
9 years ago |
fr_shine
|
e4588625d9
|
old plugin level
|
9 years ago |
superman
|
c061344ce7
|
Merge pull request #113 in BA/design from ~SHINE/design:release to release
* commit 'e681fde3c279cf9253638b25a1817c1b36962a6d':
api level
|
9 years ago |
fr_shine
|
e681fde3c2
|
api level
|
9 years ago |
superman
|
4d95cd9bd0
|
Merge pull request #111 in BA/design from ~VITO/design:master to master
* commit '2079274c45e679a31cfde2331114de7bcf04ccc0':
改为直接获取sitecenter内容,缓存会出问题
|
9 years ago |
vito
|
2079274c45
|
改为直接获取sitecenter内容,缓存会出问题
|
9 years ago |
superman
|
1f698bea86
|
Merge pull request #110 in BA/design from ST/design:master to master
* commit 'f44e8a4575a997a68f5945a1ff4cae62e839471c':
去掉了todo注释
修改了函数名称为小写
x
增加了社工功能
sk c
|
9 years ago |