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 |
|
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 |
|
juhaoyu
|
d9b634132b
|
保证获取不到已经禁用了的图表插件实例
|
8 years ago |
|
kerry
|
c805bc3410
|
REPORT-1138 模板消息事件
|
8 years ago |
|
juhaoyu
|
ea087d4845
|
保证获取不到已经禁用了的图表插件实例
|
8 years ago |
|
fanglei
|
41191d8024
|
解决冲突
|
8 years ago |
|
fanglei
|
e02cc5be56
|
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
|
4ded7b5fec
|
将“app自适应”改成“自适应”
|
8 years ago |
|
juhaoyu
|
6cba2e4318
|
保证获取不到已经禁用了的图表插件实例
|
8 years ago |
|
superman
|
8d1afe6a94
|
Merge pull request #608 in BA/design from PF/design:dev to dev
* commit 'f3240ee6f94ee7129c0fd84ddc7c1b8b1bc43382': (22 commits)
国际化
object instance
1
国际化
calculator优化
国际化位置
国际化位置
构建文件添加src
applet去除performance工程
no message
调试构建
添加构建文件
PMD
修改插件图表为空的判断方式
PDM
PMD
整合pdfstram导出到性能插件中
修改Env获取插件plugin.xml路径的方法。 修改Plugin读取依赖的方式，使其可以读取多个依赖 给性能插件的管理器添加环境切换监听，使当环境切换时可以同步的去更新性能插件包含的功能
PMD
添加了两种监听： 1、插件变动的监听 2、StableFactory生产者和消费者的监听，并在模块启动时添加了生产者监听 目前还需： 1、添加FSPlate作为生产者 2、JavaScript缓存作为消费者 3、FSPlate比较特殊，它同时是插件变动的监听和StableFactory的生产者，需要再考虑如何设计
...
|
8 years ago |
daniel
|
f3240ee6f9
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
|
daniel
|
3de2580ad6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
|
8 years ago |
|
superman
|
20ba29667a
|
Merge pull request #606 in BA/design from ~PLOUGH/design:dev to dev
* commit 'af009c3c7866e6b4ecbf8027cd63d167630d996c':
无JIRA任务。调整代码。
REPORT-1096 不继承UIButton
无JIRA任务。调整代码。
无JIRA任务。整理代码
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
REPORT-1096 自定义界面的颜色随鼠标位置动态变化；修改取色框的UI
REPORT-1096 完成基本功能
无JIRA任务，给CustomChooserPanel.java 调整缩进
REPORT-1096 将取色按钮封装为一个类
REPORT-1096 实现第一个界面（下拉颜色选择框）里的取色器功能
|
8 years ago |
|
daniel
|
6d663e290e
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'e3b3cabc60dd6f8c16c46a2eecb232a4253a598f':
REPORT-1287 属性返回数组代码问题
|
8 years ago |
plough
|
af009c3c78
|
无JIRA任务。调整代码。
|
8 years ago |
|
plough
|
35198fa0d9
|
REPORT-1096 不继承UIButton
|
8 years ago |
|
plough
|
f2d5c68c8e
|
无JIRA任务。调整代码。
|
8 years ago |
|
plough
|
c807101e9d
|
无JIRA任务。整理代码
|
8 years ago |
|
plough
|
d998b8524c
|
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
|
8 years ago |
|
plough
|
b828b89a46
|
REPORT-1096 自定义界面的颜色随鼠标位置动态变化；修改取色框的UI
|
8 years ago |
|
plough
|
cc5d8edec9
|
REPORT-1096 完成基本功能
|
8 years ago |
|
plough
|
87b8d6266c
|
无JIRA任务，给CustomChooserPanel.java 调整缩进
|
8 years ago |
|
plough
|
d0cd522b79
|
REPORT-1096 将取色按钮封装为一个类
|
8 years ago |
|
plough
|
85a6a6076d
|
REPORT-1096 实现第一个界面（下拉颜色选择框）里的取色器功能
|
8 years ago |
|
superman
|
e3b3cabc60
|
Merge pull request #604 in BA/design from ~LEE/design_master:dev to dev
* commit '2b2b3b217ae3ac007c35cab4523be58d3c76e992':
REPORT-1287 属性返回数组代码问题
|
8 years ago |
PanLi320
|
2b2b3b217a
|
REPORT-1287 属性返回数组代码问题
rt，修复了。
|
8 years ago |
|
daniel
|
c982f8db6a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
|
superman
|
320c83d7b5
|
Merge pull request #6 in PF/design from ~DANIEL/finereport_design:dev to dev
* commit '16836bcceed76907c629fd2caf57a50834abe640':
国际化
object instance
|
8 years ago |
|
superman
|
2008f06d62
|
Merge pull request #603 in BA/design from ~FANGLEI/design:dev to dev
* commit 'ac2e680148388de81bb5d8b80320e6a65b1e47e8':
返回空数组
解决tab块设置自适应布局的时候->移动端->显示手机重布局的bug
|
8 years ago |
|
daniel
|
16836bccee
|
国际化
|
8 years ago |
|
fanglei
|
ac2e680148
|
返回空数组
|
8 years ago |
|
fanglei
|
c2eac6c0cc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
|
fanglei
|
56ead7d91a
|
解决tab块设置自适应布局的时候->移动端->显示手机重布局的bug
|
8 years ago |
|
daniel
|
773e6ec796
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
|
daniel
|
e5cd4f7471
|
object instance
|
8 years ago |
