superman
|
d845c90456
|
Merge pull request #633 in BA/design from ~PLOUGH/design:master to master
* commit '11fb4878f357c4f46fff2fe2b10142cfd82ee0f3':
REPORT-1417 中文设计器,取色器更多颜色下确定取消按钮显示为英文key值
|
8 years ago |
plough
|
11fb4878f3
|
REPORT-1417 中文设计器,取色器更多颜色下确定取消按钮显示为英文key值
|
8 years ago |
kerry
|
7fb5702556
|
REPORT-1384 按钮控件自定义颜色样式
|
8 years ago |
PanLi320
|
1067c1241d
|
REPORT-576 button样式自定义图片设置,默认背景设置
与参数面板中的button的设置保持一致。
|
8 years ago |
superman
|
f0af16ebfc
|
Merge pull request #630 in BA/design from ~NEIL/design:release to master
* commit '96519eca895b24cc8a0b945c5aec98ec61197345': (53 commits)
ct
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》修复在实时模式下,无法取消颜色拾取的问题
populate之前,移除控件本身的listener
update
删除当前按钮时,也要考虑重新更新面板
REPORT-1096 取色板=》修复一些bug
下拉框重构时,不能触发更新动作
无JIRA任务。调整代码。
REPORT-1096 不继承UIButton
无JIRA任务。调整代码。
无JIRA任务。整理代码
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
REPORT-1096 自定义界面的颜色随鼠标位置动态变化;修改取色框的UI
REPORT-1096 完成基本功能
无JIRA任务,给CustomChooserPanel.java 调整缩进
REPORT-1096 将取色按钮封装为一个类
REPORT-1096 实现第一个界面(下拉颜色选择框)里的取色器功能
REPORT-1287 属性返回数组代码问题
返回空数组
...
|
8 years ago |
plough
|
e0fa5f5d81
|
REPORT-1178 英文国际化——7/23
|
8 years ago |
plough
|
d28ca1c282
|
REPORT-1178 英文国际化——4/23
|
8 years ago |
neil
|
96519eca89
|
ct
|
8 years ago |
plough
|
52733b5f73
|
REPORT-1178 英文国际化——3/23
|
8 years ago |
superman
|
7d50ddc86e
|
Merge pull request #628 in BA/design from ~LEE/design:dev to dev
* commit '36624f09ce9a2b5a40dbb021943d8387ea02e348':
调整格式
调整一下
调整一下
调整一下
REPORT-576 tab属性部分添加
|
8 years ago |
PanLi320
|
36624f09ce
|
调整格式
|
8 years ago |
PanLi320
|
f08d6748e2
|
调整一下
|
8 years ago |
PanLi320
|
80b069f065
|
调整一下
|
8 years ago |
PanLi320
|
a73679be40
|
调整一下
|
8 years ago |
PanLi320
|
bfd06483b7
|
REPORT-576 tab属性部分添加
|
8 years ago |
superman
|
a8e17c2632
|
Merge pull request #621 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a7fafda5a41b5f8b74206a4b24be38e03b26ac5e':
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》调整代码
无JIRA任务。修改代码
REPORT-1096 取色板=》解决一些bug
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
|
8 years ago |
superman
|
e8a08d89e2
|
Merge pull request #626 in BA/design from ~LEE/design:dev to dev
* commit '11abf16bb8352e57316b12aa4f520d1d4f4179fd':
REPORT-576 tab删除提示框功能添加
|
8 years ago |
PanLi320
|
11abf16bb8
|
REPORT-576 tab删除提示框功能添加
|
8 years ago |
superman
|
c2149ba061
|
Merge pull request #625 in BA/design from ~PLOUGH/design:release to release
* commit 'e596f2aca760cd2f7c700c00d603c7861aaa8571':
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》修复在实时模式下,无法取消颜色拾取的问题
|
8 years ago |
superman
|
d365a8819d
|
Merge pull request #624 in BA/design from ~XIAOHU/design:release to release
* commit '80127439158eebed5afe31228c7cd8b963e0839f':
populate之前,移除控件本身的listener
|
8 years ago |
plough
|
e596f2aca7
|
REPORT-1096 取色板=》调整代码
|
8 years ago |
plough
|
e00595ad2a
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
8 years ago |
plough
|
54bf5da257
|
REPORT-1096 取色板=》修复在实时模式下,无法取消颜色拾取的问题
|
8 years ago |
Fangjie Hu
|
8012743915
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~xiaohu/design into release
|
8 years ago |
Fangjie Hu
|
50f28fc95e
|
populate之前,移除控件本身的listener
|
8 years ago |
superman
|
dac9d99f82
|
Merge pull request #623 in BA/design from ~XIAOHU/design:release to release
* commit 'f8a6f64b3912a1e5c17fefbe86e2b8ec5e052708':
update
删除当前按钮时,也要考虑重新更新面板
|
8 years ago |
Fangjie Hu
|
f8a6f64b39
|
update
|
8 years ago |
Fangjie Hu
|
b4965666c4
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~xiaohu/design into release
|
8 years ago |
Fangjie Hu
|
6c2bb1b4b5
|
删除当前按钮时,也要考虑重新更新面板
|
8 years ago |
plough
|
a7fafda5a4
|
REPORT-1096 取色板=》调整代码
|
8 years ago |
plough
|
10204d76da
|
REPORT-1096 取色板=》调整代码
|
8 years ago |
superman
|
dc467bd830
|
Merge pull request #622 in BA/design from ~PLOUGH/design:release to release
* commit 'a6cc41ac3084b2de6273380dabfd489815a69791':
REPORT-1096 取色板=》修复一些bug
|
8 years ago |
superman
|
9dceb0567a
|
Merge pull request #620 in BA/design from ~XIAOHU/design:release to release
* commit 'd16badad3b09ef058abd6efbdde067ec7a7bd55c':
下拉框重构时,不能触发更新动作
|
8 years ago |
plough
|
a6cc41ac30
|
REPORT-1096 取色板=》修复一些bug
|
8 years ago |
plough
|
7f11d02a53
|
无JIRA任务。修改代码
|
8 years ago |
plough
|
409eaaaa55
|
REPORT-1096 取色板=》解决一些bug
|
8 years ago |
plough
|
874d88ca75
|
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
|
8 years ago |
plough
|
f2ba828f5f
|
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
|
8 years ago |
wei
|
99705e7675
|
Merge pull request #618 in BA/design from ~FANGLEI/design:dev to dev
* commit '0be0c5ee7558fa7342a02b926f706a2439f269a8':
常量改成大写
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
Fangjie Hu
|
d16badad3b
|
下拉框重构时,不能触发更新动作
|
8 years ago |
fanglei
|
0be0c5ee75
|
常量改成大写
|
8 years ago |
superman
|
6ed3cba531
|
Merge pull request #619 in BA/design from ~PLOUGH/design:master to master
* commit 'b6463754caec344f98f488d15ec9b22e2e2d7df6':
REPORT-1298 报表平台国际化bug待修改(50处)=》第69
REPORT-1178 英文国际化——1/23
|
8 years ago |
plough
|
b6463754ca
|
REPORT-1298 报表平台国际化bug待修改(50处)=》第69
|
8 years ago |
fanglei
|
62ee9a399c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
ef34c92367
|
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
daniel
|
60b0df7960
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'e956d3a9c0bff532a4617528a64e51276effa27d':
界面按钮顺序修改了,预览图片的顺序也要相应修改
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
解决国际化文件冲突之后“app”忘记去掉
增加了移动端属性->双向自适应选项
rt
rt
oracle 存储过程问题
解决冲突
将“app自适应”改成“自适应”
|
8 years ago |
superman
|
e956d3a9c0
|
Merge pull request #617 in BA/design from ~FANGLEI/design:dev to dev
* commit '42cb8251b6d809f669cee597004cfa938b0398c3':
界面按钮顺序修改了,预览图片的顺序也要相应修改
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
|
8 years ago |
fanglei
|
42cb8251b6
|
界面按钮顺序修改了,预览图片的顺序也要相应修改
|
8 years ago |
fanglei
|
b22d2c17bf
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
84518414e4
|
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
|
8 years ago |