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 |
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 |
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 |
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 |
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 |
lonord
|
cdb7de8295
|
pmd的国际化字符串问题
|
8 years ago |
lonord
|
f3d25158fe
|
pmd
|
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 |
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 |
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 |
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 |
lee
|
2dad275f38
|
REPORT-1808 设计器内tab bug修复
1.嵌套情况下,删除不起效果。
2.删除最后一个没有提示。
3.字体自定义之后再设置默认,字体没有变回来。
|
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 |
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 |
lee
|
49e88c6ced
|
REPORT-576 字体设置功能完善
|
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 |
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 |
hugh
|
fe67f6ad45
|
把原来代码重不符合PMD要求的更正了
|
8 years ago |
hugh
|
29fdfce305
|
换个地方再开~
|
8 years ago |
hugh
|
5fa2691e8d
|
为自定义函数进行分组【一次引入一组公式用,比如财务主题公式】
|
8 years ago |
superman
|
27082090d6
|
Merge pull request #644 in BA/design from ~LEE/design_release:release to release
* commit '53068a5b3608156b16088f421995bbc0eceaac91':
无jiar任务 早上代码漏传了
|
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 |