daniel
|
3de2580ad6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
|
8 years ago |
superman
|
20ba29667a
|
Merge pull request #606 in BA/design from ~PLOUGH/design:dev to dev
* commit 'af009c3c7866e6b4ecbf8027cd63d167630d996c':
无JIRA任务。调整代码。
REPORT-1096 不继承UIButton
无JIRA任务。调整代码。
无JIRA任务。整理代码
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
REPORT-1096 自定义界面的颜色随鼠标位置动态变化;修改取色框的UI
REPORT-1096 完成基本功能
无JIRA任务,给CustomChooserPanel.java 调整缩进
REPORT-1096 将取色按钮封装为一个类
REPORT-1096 实现第一个界面(下拉颜色选择框)里的取色器功能
|
8 years ago |
plough
|
af009c3c78
|
无JIRA任务。调整代码。
|
8 years ago |
plough
|
35198fa0d9
|
REPORT-1096 不继承UIButton
|
8 years ago |
plough
|
f2d5c68c8e
|
无JIRA任务。调整代码。
|
8 years ago |
plough
|
c807101e9d
|
无JIRA任务。整理代码
|
8 years ago |
plough
|
d998b8524c
|
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
|
8 years ago |
plough
|
b828b89a46
|
REPORT-1096 自定义界面的颜色随鼠标位置动态变化;修改取色框的UI
|
8 years ago |
plough
|
cc5d8edec9
|
REPORT-1096 完成基本功能
|
8 years ago |
plough
|
87b8d6266c
|
无JIRA任务,给CustomChooserPanel.java 调整缩进
|
8 years ago |
plough
|
d0cd522b79
|
REPORT-1096 将取色按钮封装为一个类
|
8 years ago |
plough
|
85a6a6076d
|
REPORT-1096 实现第一个界面(下拉颜色选择框)里的取色器功能
|
8 years ago |
superman
|
e3b3cabc60
|
Merge pull request #604 in BA/design from ~LEE/design_master:dev to dev
* commit '2b2b3b217ae3ac007c35cab4523be58d3c76e992':
REPORT-1287 属性返回数组代码问题
|
8 years ago |
PanLi320
|
2b2b3b217a
|
REPORT-1287 属性返回数组代码问题
rt,修复了。
|
8 years ago |
daniel
|
c982f8db6a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
superman
|
320c83d7b5
|
Merge pull request #6 in PF/design from ~DANIEL/finereport_design:dev to dev
* commit '16836bcceed76907c629fd2caf57a50834abe640':
国际化
object instance
|
8 years ago |
superman
|
2008f06d62
|
Merge pull request #603 in BA/design from ~FANGLEI/design:dev to dev
* commit 'ac2e680148388de81bb5d8b80320e6a65b1e47e8':
返回空数组
解决tab块设置自适应布局的时候->移动端->显示手机重布局的bug
|
8 years ago |
daniel
|
16836bccee
|
国际化
|
8 years ago |
fanglei
|
ac2e680148
|
返回空数组
|
8 years ago |
fanglei
|
c2eac6c0cc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
56ead7d91a
|
解决tab块设置自适应布局的时候->移动端->显示手机重布局的bug
|
8 years ago |
daniel
|
773e6ec796
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
daniel
|
e5cd4f7471
|
object instance
|
8 years ago |
superman
|
5703aad7ec
|
Merge pull request #601 in BA/design from ~FANGLEI/design:dev to dev
* commit '3139e70f361796ac96f0277d3f592bbb484c9392':
改了一下移动端选项卡里面标题“自适应布局”和“绝对布局”统一为“手机属性”
给设计器->属性面板->绝对布局->移动端->加上手机重布局
|
8 years ago |
fanglei
|
3139e70f36
|
改了一下移动端选项卡里面标题“自适应布局”和“绝对布局”统一为“手机属性”
|
8 years ago |
fanglei
|
33f9cc658a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
ed3874dc5c
|
给设计器->属性面板->绝对布局->移动端->加上手机重布局
|
8 years ago |
daniel
|
49fe77dc60
|
Merge pull request #5 in PF/design from ~DANIEL/finereport_design:dev to dev
* commit '3baecb853541768efb591deeebc8322add8b2054':
1
国际化
calculator优化
1
|
8 years ago |
daniel
|
3baecb8535
|
1
|
8 years ago |
daniel
|
531af20825
|
国际化
|
8 years ago |
daniel
|
08220632e4
|
calculator优化
|
8 years ago |
daniel
|
959e8a1d7a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
daniel
|
0469540bc1
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
daniel
|
fcc61c8db0
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'fdfef6ef0a18f049f9fee481c1b432ffd50fa754':
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
获取plotTypePane标题名
update
在构建下拉框时,就考虑到是否处于切换模式
update
update
模板参数触发界面更新
|
8 years ago |
superman
|
fdfef6ef0a
|
Merge pull request #600 in BA/design from ~ZACK/design:dev to dev
* commit '48ce7996135896ae8965a82065b32512ac3e04cc':
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
|
8 years ago |
superman
|
e6832149ae
|
Merge pull request #599 in BA/design from ~XIAOHU/design:dev to dev
* commit '4bd7111e6c1ac2bb4c080dfa2591560914a6827f':
获取plotTypePane标题名
|
8 years ago |
zack
|
48ce799613
|
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
|
8 years ago |
Fangjie Hu
|
4bd7111e6c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
Fangjie Hu
|
dcc4c63bdf
|
获取plotTypePane标题名
|
8 years ago |
superman
|
b6ff009675
|
Merge pull request #596 in BA/design from ~XIAOHU/design:dev to dev
* commit '2ec2f5617da1ce6695cad8bdaee7b6253706dae8':
update
在构建下拉框时,就考虑到是否处于切换模式
update
update
模板参数触发界面更新
|
8 years ago |
Fangjie Hu
|
2ec2f5617d
|
update
|
8 years ago |
Fangjie Hu
|
cb55c20c56
|
在构建下拉框时,就考虑到是否处于切换模式
|
8 years ago |
superman
|
f0eaec514b
|
Merge pull request #4 in PF/design from ~JU/pr-design:dev to dev
* commit '8974e4eb3121aa2e0344a7bb33a81e5a2893d41a':
国际化位置
国际化位置
|
8 years ago |
juhaoyu
|
8974e4eb31
|
国际化位置
|
8 years ago |
juhaoyu
|
c612982ac4
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
juhaoyu
|
618303fd74
|
国际化位置
|
8 years ago |
daniel
|
27b1ba148e
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '63e9c83c8dd0f7202f3fbeb5f048b4b92c83e4de':
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
superman
|
63e9c83c8d
|
Merge pull request #595 in BA/design from ~NEIL/design:dev to dev
* commit '3275137a96c52ed15c6af220ca7d150e5ad01b40':
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
neil
|
3275137a96
|
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
daniel
|
51f0649c13
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |