daniel
|
75abe6b8bb
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '991839cb3cea5e8c6ea72e432d6076e0b2d3aea8':
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
991839cb3c
|
Merge pull request #636 in BA/design from ~LEE/design:dev to dev
* commit 'e4a68daca93273f2e86c2024321252387067074b':
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
rinoux
|
93b886410b
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '3dab55b9d8bd0aa2ad6d02de309898d1829fe26b':
添加国际化,修改PMD
REPORT-1384 按钮控件自定义颜色样式
REPORT-576 button样式自定义图片设置,默认背景设置
调整格式
调整一下
调整一下
调整一下
REPORT-576 tab属性部分添加
REPORT-576 tab删除提示框功能添加
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》调整代码
无JIRA任务。修改代码
REPORT-1096 取色板=》解决一些bug
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
常量改成大写
在表单->模板菜单->移动端属性中加入报表解析方式的选项
|
8 years ago |
PanLi320
|
e4a68daca9
|
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
3dab55b9d8
|
Merge pull request #632 in BA/design from ~KERRY/design:dev to dev
* commit '3e1bf1e4bac1eafd54054d69df43a8900ab54fbf':
添加国际化,修改PMD
REPORT-1384 按钮控件自定义颜色样式
|
8 years ago |
kerry
|
3e1bf1e4ba
|
添加国际化,修改PMD
|
8 years ago |
superman
|
c8f4478358
|
Merge pull request #631 in BA/design from ~LEE/design:dev to dev
* commit '1067c1241d2fe80052005aa1aaaf7c8a69d53192':
REPORT-576 button样式自定义图片设置,默认背景设置
|
8 years ago |
kerry
|
7fb5702556
|
REPORT-1384 按钮控件自定义颜色样式
|
8 years ago |
PanLi320
|
1067c1241d
|
REPORT-576 button样式自定义图片设置,默认背景设置
与参数面板中的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 |
daniel
|
60b0df7960
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'e956d3a9c0bff532a4617528a64e51276effa27d':
界面按钮顺序修改了,预览图片的顺序也要相应修改
调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
解决国际化文件冲突之后“app”忘记去掉
增加了移动端属性->双向自适应选项
rt
rt
oracle 存储过程问题
解决冲突
将“app自适应”改成“自适应”
|
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 |
superman
|
31364316b0
|
Merge pull request #615 in BA/design from ~XIAOXIA/design:dev to dev
* commit 'efda5a486ffdca44437e9c84bbd830784823e7d1':
rt
rt
oracle 存储过程问题
|
8 years ago |
xiaoxia
|
efda5a486f
|
rt
|
8 years ago |
superman
|
1b072d22dc
|
Merge pull request #7 in PF/design from ~RINOUX/design:dev to dev
* commit '757e6e4d2b67941a3f9496975be470be9f2d74df':
加入设计器启动打开文件的接口
|
8 years ago |
rinoux
|
757e6e4d2b
|
Merging in latest from upstream (PF/design:refs/heads/dev)
* commit '6612dc886271299a9c5b851519c7a7865093b431':
修改判断逻辑
将Closeable的判断等事情放到专门的容器中
将Closeable的判断等事情放到专门的容器中
修改PMD中的问题
保证获取不到已经禁用了的图表插件实例
保证获取不到已经禁用了的图表插件实例
REPORT-1138 模板消息事件
保证获取不到已经禁用了的图表插件实例
保证获取不到已经禁用了的图表插件实例
|
8 years ago |
xiaoxia
|
57ebd42fcb
|
rt
|
8 years ago |
xiaoxia
|
9309c76f1a
|
oracle 存储过程问题
|
8 years ago |
superman
|
6612dc8862
|
Merge pull request #610 in BA/design from ~KERRY/design:dev to dev
* commit '993abf5ab5a543cf47338c2249559af0dba17b19':
修改PMD中的问题
REPORT-1138 模板消息事件
|
8 years ago |
superman
|
c69102453c
|
Merge pull request #611 in BA/design from ~JU/1-ba-design:dev to dev
* commit '35782fcac18c1e3f7e19067447ee6a3fe0ff70c7':
修改判断逻辑
将Closeable的判断等事情放到专门的容器中
将Closeable的判断等事情放到专门的容器中
保证获取不到已经禁用了的图表插件实例
保证获取不到已经禁用了的图表插件实例
保证获取不到已经禁用了的图表插件实例
保证获取不到已经禁用了的图表插件实例
|
8 years ago |
juhaoyu
|
35782fcac1
|
修改判断逻辑
|
8 years ago |
juhaoyu
|
be6f8a80d6
|
将Closeable的判断等事情放到专门的容器中
|
8 years ago |
juhaoyu
|
3a948e4f9a
|
将Closeable的判断等事情放到专门的容器中
|
8 years ago |
kerry
|
993abf5ab5
|
修改PMD中的问题
|
8 years ago |
juhaoyu
|
d982955398
|
保证获取不到已经禁用了的图表插件实例
|
8 years ago |