superman
|
776ea87c51
|
Merge pull request #653 in BA/design from ~LEE/design_release:release to release
* commit '49e88c6ced05c9f6853550e5ef9da6179189a7fd':
REPORT-576 字体设置功能完善
|
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 |
superman
|
47a2b6b0f2
|
Merge pull request #641 in BA/design from ~LEE/design_release:release to release
* commit '8d9ddb0502227685c5eecd0cda291b930289c0b1':
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
PanLi320
|
8d9ddb0502
|
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
superman
|
908dbd687c
|
Merge pull request #637 in BA/design from ~LEE/design_release:release to release
* commit '6d32ba0c7bc42d62fd918a3ff77892cf5d6cd557':
1
代码调整
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
PanLi320
|
6d32ba0c7b
|
1
1
|
8 years ago |
PanLi320
|
83da497124
|
代码调整
|
8 years ago |
PanLi320
|
e5903dbf9d
|
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
这边条件判断取一下,留下两个默认的属性即可。
|
8 years ago |
PanLi320
|
002cb45615
|
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
6dcd58259d
|
Merge pull request #635 in BA/design from ~LEE/design_release:release to release
* commit '5cc464edb21f82e7b61bc4a4867540227ea9f1b5':
REPORT-576 dev内代码完善到release中
|
8 years ago |
PanLi320
|
5cc464edb2
|
REPORT-576 dev内代码完善到release中
button初始化背景颜色
|
8 years ago |
superman
|
7d50ddc86e
|
Merge pull request #628 in BA/design from ~LEE/design:dev to dev
* commit '36624f09ce9a2b5a40dbb021943d8387ea02e348':
调整格式
调整一下
调整一下
调整一下
REPORT-576 tab属性部分添加
|
8 years ago |
PanLi320
|
36624f09ce
|
调整格式
|
8 years ago |
PanLi320
|
f08d6748e2
|
调整一下
|
8 years ago |
PanLi320
|
80b069f065
|
调整一下
|
8 years ago |
PanLi320
|
a73679be40
|
调整一下
|
8 years ago |
PanLi320
|
bfd06483b7
|
REPORT-576 tab属性部分添加
|
8 years ago |
superman
|
a8e17c2632
|
Merge pull request #621 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a7fafda5a41b5f8b74206a4b24be38e03b26ac5e':
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》调整代码
无JIRA任务。修改代码
REPORT-1096 取色板=》解决一些bug
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
|
8 years ago |
superman
|
e8a08d89e2
|
Merge pull request #626 in BA/design from ~LEE/design:dev to dev
* commit '11abf16bb8352e57316b12aa4f520d1d4f4179fd':
REPORT-576 tab删除提示框功能添加
|
8 years ago |
PanLi320
|
11abf16bb8
|
REPORT-576 tab删除提示框功能添加
|
8 years ago |
plough
|
a7fafda5a4
|
REPORT-1096 取色板=》调整代码
|
8 years ago |
plough
|
10204d76da
|
REPORT-1096 取色板=》调整代码
|
8 years ago |
plough
|
7f11d02a53
|
无JIRA任务。修改代码
|
8 years ago |
plough
|
409eaaaa55
|
REPORT-1096 取色板=》解决一些bug
|
8 years ago |
plough
|
874d88ca75
|
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
|
8 years ago |
plough
|
f2ba828f5f
|
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
|
8 years ago |
wei
|
99705e7675
|
Merge pull request #618 in BA/design from ~FANGLEI/design:dev to dev
* commit '0be0c5ee7558fa7342a02b926f706a2439f269a8':
常量改成大写
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
fanglei
|
0be0c5ee75
|
常量改成大写
|
8 years ago |
fanglei
|
62ee9a399c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
ef34c92367
|
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
superman
|
e956d3a9c0
|
Merge pull request #617 in BA/design from ~FANGLEI/design:dev to dev
* commit '42cb8251b6d809f669cee597004cfa938b0398c3':
界面按钮顺序修改了,预览图片的顺序也要相应修改
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
|
8 years ago |
fanglei
|
42cb8251b6
|
界面按钮顺序修改了,预览图片的顺序也要相应修改
|
8 years ago |
fanglei
|
b22d2c17bf
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
84518414e4
|
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
|
8 years ago |
superman
|
1bc77c53cb
|
Merge pull request #616 in BA/design from ~FANGLEI/design:dev to dev
* commit 'c713d82b89f02774fb1d74bdde842ec6587c45b1':
解决国际化文件冲突之后“app”忘记去掉
增加了移动端属性->双向自适应选项
解决冲突
将“app自适应”改成“自适应”
|
8 years ago |
fanglei
|
c713d82b89
|
解决国际化文件冲突之后“app”忘记去掉
|
8 years ago |
fanglei
|
27c3deb5dc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
|
8 years ago |
fanglei
|
276a06350e
|
增加了移动端属性->双向自适应选项
|
8 years ago |