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 |
|
daniel
|
f4e1482b2c
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '4352586e6b17d902164b060f78e1287629efe8f8': (149 commits)
无JIRA任务， build failed
无JIRA任务， build failed
pmd
pmd
ct
无JIRA任务， 修复合并冲突
REPORT-1097 pmd
REPORT-1097 超链支持在平台内标签打开
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法，这里先屏蔽一下。
REPORT-884 绝对布局，参数面板控件可以拖到下面与组件重叠
rt
rt
rt
1
1
REPORT-912 单元格数据进度条
REPORT-1147 脚本更新问题
REPORT-1147 脚本更新问题
test
测试
...
|
8 years ago |
|
Fangjie Hu
|
eb66d714bb
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
|
superman
|
4352586e6b
|
Merge pull request #592 in BA/design from ~NEIL/design:dev to dev
* commit '46e1e1f0452346401f3690539ffbe9eb3e89df4c':
无JIRA任务， build failed
无JIRA任务， build failed
|
8 years ago |
|
neil
|
46e1e1f045
|
无JIRA任务， build failed
|
8 years ago |
|
neil
|
11d2469cc5
|
无JIRA任务， build failed
|
8 years ago |
|
superman
|
e32b9f3ca5
|
Merge pull request #591 in BA/design from ~NEIL/design:release to dev
* commit 'e36b2fdbf903fc674d2281c3c46a223588b17c13': (135 commits)
pmd
pmd
ct
无JIRA任务， 修复合并冲突
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法，这里先屏蔽一下。
rt
rt
rt
1
REPORT-1147 脚本更新问题
test
测试
调试
调试
1
无JIRA任务， build failed
REPORT-1092 两个一样的表单demo，预览的效果不一样 pmd
无JIRA任务， 国际化
pmd
REPORT-1092 两个一样的表单demo，预览的效果不一样 dev上测试验收过了，同步到master
...
|
8 years ago |
|
neil
|
e36b2fdbf9
|
pmd
|
8 years ago |
|
neil
|
717ce11090
|
pmd
|
8 years ago |
|
superman
|
2dd43cd67d
|
Merge pull request #588 in BA/design from ~ZACK/design:dev to dev
* commit '3ae0adb1c0e8c54e9b3f0750acb208e204f47421':
REPORT-1097 pmd
REPORT-1097 超链支持在平台内标签打开
|
8 years ago |
|
neil
|
72cb528a77
|
ct
|
8 years ago |
|
superman
|
99e0497e43
|
Merge pull request #589 in BA/design from ~NEIL/design:master to master
* commit '805fe40f14451f4d5d1b6ed7943cc55ce61bd098':
无JIRA任务， 修复合并冲突
|
8 years ago |
|
neil
|
805fe40f14
|
无JIRA任务， 修复合并冲突
|
8 years ago |
