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 |
xiaoxia
|
a42bd27938
|
rt
|
8 years ago |
fanglei
|
c32b292e35
|
RadioButton的构造函数的第二个参数修改为MobileFitAttrState
|
8 years ago |
fanglei
|
47a758f0b1
|
表单的双向自适应和不自适应顺序忘记改了
|
8 years ago |
superman
|
e408b5ee40
|
Merge pull request #661 in BA/design from ~LEE/design_release:release to release
* commit 'a2a7a6bd155c5bd97ac181cc37b4e603affde8d7':
REPORT-1808 字体,背景
|
8 years ago |
lee
|
a2a7a6bd15
|
REPORT-1808 字体,背景
1.字体设置之后的控件的宽度,导致设计器端的显示异常。
2.背景设置恢复默认之后,后台的属性设置为空。
|
8 years ago |
xiaoxia
|
e539908dcb
|
rt
|
8 years ago |
superman
|
883f6a580a
|
Merge pull request #660 in BA/design from ~LEE/design_release:release to release
* commit '3b5c88284205dfe01a381e182fb4ba357914b846':
REPORT-1808 font空值判断给予默认值
|
8 years ago |
lee
|
3b5c882842
|
REPORT-1808 font空值判断给予默认值
|
8 years ago |
fanglei
|
768035300a
|
修改了双向自适应和不自适应按钮的顺序
|
8 years ago |
superman
|
1243b1c491
|
Merge pull request #655 in BA/design from ~HUGH/design:release to release
* commit '6a8b12b3b109de89384b1b5de118bfb7e9d1525d':
遗漏了一个地方
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
|
8 years ago |
superman
|
5c7a0b5130
|
Merge pull request #658 in BA/design from ~LEE/design_release:release to release
* commit '001aab092b24f24154103d2b6d54e5ccc53f9c4a':
1
|
8 years ago |
lee
|
001aab092b
|
1
1
|
8 years ago |
superman
|
a1fef7c518
|
Merge pull request #657 in BA/design from ~LEE/design_release:release to release
* commit '2dad275f38b868bab361a6ff18b51ad0b7344ea9':
REPORT-1808 设计器内tab bug修复
|
8 years ago |
plough
|
16692eb1cb
|
REPORT-1096 取色板=>去掉自定义颜色选择界面取色器按钮的边框
|
8 years ago |
lee
|
2dad275f38
|
REPORT-1808 设计器内tab bug修复
1.嵌套情况下,删除不起效果。
2.删除最后一个没有提示。
3.字体自定义之后再设置默认,字体没有变回来。
|
8 years ago |
xiaoxia
|
1985e8d4f3
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into dev
|
8 years ago |
xiaoxia
|
81db8a7da5
|
rt
|
8 years ago |
superman
|
a0368e7dcc
|
Merge pull request #656 in BA/design from ~PLOUGH/design:release to release
* commit '2c50ee981b85daf7483d335720996447448b0466':
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
|
8 years ago |
plough
|
c2ede0df04
|
REPORT-1096 取色板=>调整自定义颜色选择界面的取色器按钮位置
|
8 years ago |
plough
|
02f5befc45
|
REPORT-1096 取色板=>1、修改无透明颜色选择框的样式;2、“更多颜色”按钮下留出空隙;3、取色器按钮大小修改为与色块相同;4、空出一个色块的位置
|
8 years ago |
superman
|
776ea87c51
|
Merge pull request #653 in BA/design from ~LEE/design_release:release to release
* commit '49e88c6ced05c9f6853550e5ef9da6179189a7fd':
REPORT-576 字体设置功能完善
|
8 years ago |
plough
|
2c50ee981b
|
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
|
8 years ago |
hugh
|
6a8b12b3b1
|
遗漏了一个地方
|
8 years ago |
hugh
|
dcb837a721
|
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
|
8 years ago |
hugh
|
406c5e7d1b
|
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
|
8 years ago |
plough
|
cb40201537
|
REPORT-1096 取色板=>将取色板弹出框的位置改为居中
|
8 years ago |
lee
|
49e88c6ced
|
REPORT-576 字体设置功能完善
|
8 years ago |
plough
|
6ceca72b5d
|
merge
|
8 years ago |
plough
|
baa6b1728c
|
REPORT-1178 英文国际化——8、11、13、14、15、16部分
|
8 years ago |
superman
|
ff8a12b213
|
Merge pull request #651 in BA/design from ~LEE/design:dev to dev
* commit '8a94bcb0fddf2d16646362c4a20a2269d87b08e1':
1
无jiar 国际化文件内容修改
|
8 years ago |
superman
|
dede814828
|
Merge pull request #652 in BA/design from ~LEE/design_release:release to release
* commit '3e336de89112134b56027d55542717a26f04e6a2':
1
国际化文件
|
8 years ago |
lee
|
3e336de891
|
1
1
|
8 years ago |
lee
|
bbff9a6b83
|
国际化文件
|
8 years ago |
PanLi320
|
8a94bcb0fd
|
1
1
|
8 years ago |
PanLi320
|
adbebac9de
|
无jiar 国际化文件内容修改
|
8 years ago |
superman
|
53f781da8f
|
Merge pull request #649 in BA/design from ~XIAOHU/design:dev to dev
* commit 'fa718b8e1bbf21acc7972237daab015ab869f352':
单元格配置界面接口
|
8 years ago |
superman
|
ff41eabf85
|
Merge pull request #642 in BA/design from ~LEE/design:dev to dev
* commit '16a0924d53a44090a0af9b0b535157e3549225ae':
调整
REPORT-576 tabpane属性添加,添加一个轮播属性
REPORT-576 font代码调整
|
8 years ago |
superman
|
cabf42ac13
|
Merge pull request #650 in BA/design from ~HUGH/design:release to release
* commit '9d9cbacef0bd50a56148f4b7ae28648ca1f9db31':
调整国际化,命名之类的
把原来代码重不符合PMD要求的更正了
换个地方再开~
为自定义函数进行分组【一次引入一组公式用,比如财务主题公式】
|
8 years ago |
hugh
|
9d9cbacef0
|
调整国际化,命名之类的
|
8 years ago |
Fangjie Hu
|
fa718b8e1b
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
Fangjie Hu
|
d69603d181
|
单元格配置界面接口
|
8 years ago |
hugh
|
fe67f6ad45
|
把原来代码重不符合PMD要求的更正了
|
8 years ago |
PanLi320
|
16a0924d53
|
调整
|
8 years ago |
hugh
|
29fdfce305
|
换个地方再开~
|
8 years ago |
PanLi320
|
37d3840a81
|
REPORT-576 tabpane属性添加,添加一个轮播属性
|
8 years ago |
superman
|
08e3b2e33f
|
Merge pull request #645 in BA/design from ~XIAOHU/design:dev to dev
* commit 'b26516de0aab2b9f5a085b20afe704e749e693c9':
甘特图数据配置界面
|
8 years ago |
hugh
|
5fa2691e8d
|
为自定义函数进行分组【一次引入一组公式用,比如财务主题公式】
|
8 years ago |