Fangjie Hu
|
b26516de0a
|
merge
|
8 years ago |
Fangjie Hu
|
345922137f
|
甘特图数据配置界面
|
8 years ago |
PanLi320
|
53068a5b36
|
无jiar任务 早上代码漏传了
|
8 years ago |
superman
|
5331dc7d4d
|
Merge pull request #643 in BA/design from ~LEE/design_release:release to release
* commit 'a869832d99fd999684129aa43ca097254b1bba62':
REPORT-576 font代码调整
|
8 years ago |
PanLi320
|
a869832d99
|
REPORT-576 font代码调整
|
8 years ago |
PanLi320
|
15356ec44b
|
REPORT-576 font代码调整
|
8 years ago |
superman
|
4ae7e0bf23
|
Merge pull request #640 in BA/design from ~LEE/design:dev to dev
* commit 'aad680b44458e67fdbad394aa81afec71e8f865b':
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
superman
|
47a2b6b0f2
|
Merge pull request #641 in BA/design from ~LEE/design_release:release to release
* commit '8d9ddb0502227685c5eecd0cda291b930289c0b1':
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
superman
|
e00d4fcba1
|
Merge pull request #639 in BA/design from ~XIAOHU/design:dev to dev
* commit 'e104e8aaa94d7090ea3d8b5b3c611e844c5e7cb8':
delete
delete
|
8 years ago |
PanLi320
|
8d9ddb0502
|
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
PanLi320
|
aad680b444
|
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
Fangjie Hu
|
e104e8aaa9
|
delete
|
8 years ago |
Fangjie Hu
|
923defe65c
|
delete
|
8 years ago |
superman
|
908dbd687c
|
Merge pull request #637 in BA/design from ~LEE/design_release:release to release
* commit '6d32ba0c7bc42d62fd918a3ff77892cf5d6cd557':
1
代码调整
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
0f50d5dcc7
|
Merge pull request #8 in PF/design from ~RINOUX/design:dev to dev
* commit '6ff9c2c521c0d8a862911839c931b8ac4f8c691d':
修复错误
|
8 years ago |
rinoux
|
6ff9c2c521
|
Merging in latest from upstream (PF/design:refs/heads/dev)
* commit '75abe6b8bbd34aa7866432f3beffa29f854c0144':
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
daniel
|
75abe6b8bb
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '991839cb3cea5e8c6ea72e432d6076e0b2d3aea8':
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
rinoux
|
703d09044d
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~rinoux/design into dev
|
8 years ago |
rinoux
|
8aaee42dee
|
修复错误
|
8 years ago |
superman
|
6376514b9b
|
Merge pull request #638 in BA/design from ~XIAOHU/design:master to master
* commit 'd87a903c8116bf14941e8aa26555f57e4d236182':
下拉框监听器
|
8 years ago |
Fangjie Hu
|
d87a903c81
|
下拉框监听器
|
8 years ago |
PanLi320
|
6d32ba0c7b
|
1
1
|
8 years ago |
PanLi320
|
83da497124
|
代码调整
|
8 years ago |
superman
|
991839cb3c
|
Merge pull request #636 in BA/design from ~LEE/design:dev to dev
* commit 'e4a68daca93273f2e86c2024321252387067074b':
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
PanLi320
|
e5903dbf9d
|
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
这边条件判断取一下,留下两个默认的属性即可。
|
8 years ago |
rinoux
|
93b886410b
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '3dab55b9d8bd0aa2ad6d02de309898d1829fe26b':
添加国际化,修改PMD
REPORT-1384 按钮控件自定义颜色样式
REPORT-576 button样式自定义图片设置,默认背景设置
调整格式
调整一下
调整一下
调整一下
REPORT-576 tab属性部分添加
REPORT-576 tab删除提示框功能添加
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》调整代码
无JIRA任务。修改代码
REPORT-1096 取色板=》解决一些bug
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
常量改成大写
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
PanLi320
|
002cb45615
|
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
PanLi320
|
e4a68daca9
|
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
6dcd58259d
|
Merge pull request #635 in BA/design from ~LEE/design_release:release to release
* commit '5cc464edb21f82e7b61bc4a4867540227ea9f1b5':
REPORT-576 dev内代码完善到release中
|
8 years ago |
PanLi320
|
5cc464edb2
|
REPORT-576 dev内代码完善到release中
button初始化背景颜色
|
8 years ago |
superman
|
3dab55b9d8
|
Merge pull request #632 in BA/design from ~KERRY/design:dev to dev
* commit '3e1bf1e4bac1eafd54054d69df43a8900ab54fbf':
添加国际化,修改PMD
REPORT-1384 按钮控件自定义颜色样式
|
8 years ago |
kerry
|
3e1bf1e4ba
|
添加国际化,修改PMD
|
8 years ago |
superman
|
c8f4478358
|
Merge pull request #631 in BA/design from ~LEE/design:dev to dev
* commit '1067c1241d2fe80052005aa1aaaf7c8a69d53192':
REPORT-576 button样式自定义图片设置,默认背景设置
|
8 years ago |
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 |