superman
|
385facb800
|
Merge pull request #674 in BA/design from PF/design:dev to dev
* commit 'efbe2e4b7953e787c1f7324c2e6a59514f3794ae':
修复错误
加入设计器启动打开文件的接口
|
8 years ago |
superman
|
5a336c1aa9
|
Merge pull request #671 in BA/design from ~PLOUGH/design:dev to dev
* commit '37b9b4fcb914b0b29418e095d90d398942e25dce':
无JIRA任务。调整代码
整理代码
使用GraphHelper,修改临时代码
REPORT-1096 取色板=>将“最近使用的颜色”面板的色块改为6个;修改取色 器按钮背景为白色
REPORT-1096 取色板=>去掉自定义颜色选择界面取色器按钮的边框
REPORT-1096 取色板=>调整自定义颜色选择界面的取色器按钮位置
REPORT-1096 取色板=>1、修改无透明颜色选择框的样式;2、“更多颜色”按钮下留出空隙;3、取色器按钮大小修改为与色块相同;4、空出一个色块的位置
REPORT-1096 取色板=>将取色板弹出框的位置改为居中
REPORT-1178 英文国际化——8、11、13、14、15、16部分
REPORT-1178 英文国际化——7/23
REPORT-1178 英文国际化——4/23
REPORT-1178 英文国际化——3/23
|
8 years ago |
superman
|
acd2a36333
|
Merge pull request #675 in BA/design from ~ZHOUPING/design:dev to dev
* commit '8574411195c39649057321050a666ab957298aba':
无JIRA任务 tab交互改良代码同步 release同步到dev
|
8 years ago |
neil
|
78e998493d
|
Merge pull request #676 in BA/design from ~NEIL/design:master to master
* commit 'fb6e4806564957f5cedc93a83d37c76d93f92f5f':
无JIRA任务, 冲突修正
|
8 years ago |
neil
|
fb6e480656
|
无JIRA任务, 冲突修正
|
8 years ago |
zhouping
|
8574411195
|
无JIRA任务 tab交互改良代码同步
release同步到dev
|
8 years ago |
plough
|
37b9b4fcb9
|
无JIRA任务。调整代码
|
8 years ago |
superman
|
e338a0198e
|
Merge pull request #673 in BA/design from ~NEIL/design:release to master
* commit '2169ef5cf934e5fbd589eb5780cb30aff2502f43': (87 commits)
ct
ct
国际化翻译
无JIRA任务 tab功能屏蔽
REPORT-1814 表单tab块的改良bug 功能屏蔽
xxx
REPORT-1814 表单tab块的页签拖动新功能 bugfix
pmd的国际化字符串问题
pmd
com.dr.data.SubmitJob接口提示更改
REPORT-1808 字体,背景
REPORT-1808 font空值判断给予默认值
1
REPORT-1808 设计器内tab bug修复
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
遗漏了一个地方
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
REPORT-576 字体设置功能完善
1
...
|
8 years ago |
neil
|
2169ef5cf9
|
ct
|
8 years ago |
neil
|
34e1c9c95b
|
ct
|
8 years ago |
plough
|
c84e090002
|
整理代码
|
8 years ago |
plough
|
01aa1c3956
|
使用GraphHelper,修改临时代码
|
8 years ago |
plough
|
e632f995b6
|
merge
|
8 years ago |
superman
|
ef6043fb55
|
Merge pull request #670 in BA/design from ~GREY/design:release to release
* commit '604f0cbc21a20c37dddd310ce4d1988b3ba17eef':
国际化翻译
|
8 years ago |
wanling wang
|
604f0cbc21
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~grey/design into release
|
8 years ago |
wanling wang
|
faabc89c88
|
国际化翻译
|
8 years ago |
superman
|
b803592afb
|
Merge pull request #669 in BA/design from ~ZHOUPING/design:release to release
* commit 'efbda3dcf5bc4e132cf5b870da5c1aebfd7ff9cc':
无JIRA任务 tab功能屏蔽
|
8 years ago |
zhouping
|
efbda3dcf5
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release
|
8 years ago |
zhouping
|
12fc6d4f86
|
无JIRA任务 tab功能屏蔽
|
8 years ago |
superman
|
b81febf662
|
Merge pull request #668 in BA/design from ~ZHOUPING/design:release to release
* commit 'de903cf9a2fdae8cfd60f54fe64033e75fc631eb':
REPORT-1814 表单tab块的改良bug 功能屏蔽
|
8 years ago |
zhouping
|
de903cf9a2
|
REPORT-1814 表单tab块的改良bug
功能屏蔽
|
8 years ago |
unknown
|
6e41745aa9
|
国际化翻译
|
8 years ago |
superman
|
5226afd56d
|
Merge pull request #667 in BA/design from ~LILY/design:release to release
* commit '61cba0e483efdba37db33f37cf85218b90553c32':
xxx
|
8 years ago |
unknown
|
61cba0e483
|
xxx
|
8 years ago |
superman
|
7f4982eca5
|
Merge pull request #666 in BA/design from ~ZHOUPING/design:release to release
* commit '6404579f1774d061a678dba07dd407a105419241':
REPORT-1814 表单tab块的页签拖动新功能 bugfix
|
8 years ago |
zhouping
|
6404579f17
|
REPORT-1814 表单tab块的页签拖动新功能
bugfix
|
8 years ago |
plough
|
9421bfc288
|
REPORT-1096 取色板=>将“最近使用的颜色”面板的色块改为6个;修改取色 器按钮背景为白色
|
8 years ago |
neil
|
b3016b0e20
|
Merge pull request #663 in BA/design from ~LOY/design_fr:release to release
* commit 'cdb7de829520a8bfa2cbb2a1c3c6398b4e553f22':
pmd的国际化字符串问题
pmd
com.dr.data.SubmitJob接口提示更改
|
8 years ago |
superman
|
4f01db6e76
|
Merge pull request #665 in BA/design from ~XIAOXIA/design:dev to dev
* commit 'a8716db31ac9eb4adde59c6c2bde94845e59d150':
rt
rt
rt
rt
|
8 years ago |
xiaoxia
|
a8716db31a
|
rt
|
8 years ago |
xiaoxia
|
288464b55f
|
rt
|
8 years ago |
xiaoxia
|
91d9eecc6e
|
rt
|
8 years ago |
xiaoxia
|
db5a843390
|
rt
|
8 years ago |
daniel
|
b609ff32a3
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
superman
|
13e7094b33
|
Merge pull request #664 in BA/design from ~KERRY/design:dev to dev
* commit 'f6ef244651a7a71f6915c9c9e4a4a92a929efb19':
代码修改
修改PMD
REPORT-1384 增加控件管理中的按钮颜色设置
|
8 years ago |
kerry
|
f6ef244651
|
代码修改
|
8 years ago |
lonord
|
cdb7de8295
|
pmd的国际化字符串问题
|
8 years ago |
kerry
|
54678080a6
|
修改PMD
|
8 years ago |
kerry
|
d739db936c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev
|
8 years ago |
kerry
|
e21a7e997d
|
REPORT-1384 增加控件管理中的按钮颜色设置
|
8 years ago |
daniel
|
efbe2e4b79
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '9548523e0a36e9280307560e350a24e812cc1da7':
不再独自创建带index的选项按钮,而是继承自UIRadioButton
rt
rt
rt
RadioButton的构造函数的第二个参数修改为MobileFitAttrState
表单的双向自适应和不自适应顺序忘记改了
rt
修改了双向自适应和不自适应按钮的顺序
rt
|
8 years ago |
superman
|
9548523e0a
|
Merge pull request #659 in BA/design from ~FANGLEI/design:dev to dev
* commit 'ecdb72d4f4aa276443b18bb52e63d206ad0dbb2f':
不再独自创建带index的选项按钮,而是继承自UIRadioButton
RadioButton的构造函数的第二个参数修改为MobileFitAttrState
表单的双向自适应和不自适应顺序忘记改了
修改了双向自适应和不自适应按钮的顺序
|
8 years ago |
superman
|
8e4b47ed5a
|
Merge pull request #662 in BA/design from ~XIAOXIA/design:dev to dev
* commit '5a16de43fa8ede11ce2e05662b0781cf96b992c2':
rt
rt
rt
rt
rt
|
8 years ago |
fanglei
|
ecdb72d4f4
|
不再独自创建带index的选项按钮,而是继承自UIRadioButton
|
8 years ago |
xiaoxia
|
5a16de43fa
|
rt
|
8 years ago |
xiaoxia
|
74f529695d
|
rt
|
8 years ago |
lonord
|
f3d25158fe
|
pmd
|
8 years ago |
daniel
|
67752d40a7
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'ff8a12b213f2d80cd7887c4345efe97a861ca2bf':
1
无jiar 国际化文件内容修改
单元格配置界面接口
调整
REPORT-576 tabpane属性添加,添加一个轮播属性
甘特图数据配置界面
REPORT-576 font代码调整
REPORT-576 tab中button内容自动扩展bug修复
delete
delete
|
8 years ago |
lonord
|
7bd8497060
|
Merge branch 'release' of ssh://www.finedevelop.com:7999/~loy/design_fr into release
|
8 years ago |
lonord
|
142246013e
|
com.dr.data.SubmitJob接口提示更改
|
8 years ago |