MoMeak
|
b1112d2abc
|
Merging in latest from upstream (ST/design:refs/heads/release/9.0)
* commit '4d9216e2916846931d5cdf091324813789b6e723':
REPORT-6096 Tab页中组件在复制粘贴后会位移
MOBILE-7081 修复9.0表单body里移动端的控件顺序不能拖动的bug
REPORT-5885 插件安装卸载——frm图表界面图标没有实时刷新 环境和插件变更时都刷新
REPORT-5942 回滚代码,改提交到dev
CHART-1844 面板调整
REPORT-5945 表单切换到绝对布局时,组件缩放重置为双向自适应=>9.0因代码结构变动,切换不生效
无JIRA任务,8 -> 9
|
8 years ago |
superman
|
4d9216e291
|
Merge pull request #1526 in BA/design from ~YAOH.WU/a_design_0811:release/9.0 to release/9.0
* commit '88d7dcc46b7857b9921a46a3c24d2725345c4101':
REPORT-6096 Tab页中组件在复制粘贴后会位移
|
8 years ago |
yaoh.wu
|
88d7dcc46b
|
REPORT-6096 Tab页中组件在复制粘贴后会位移
|
8 years ago |
MoMeak
|
199a993185
|
REPORT-6090 单元格添加超链接-悬浮窗图表和超链接-悬浮元素有问题
|
8 years ago |
superman
|
59c9cd163c
|
Merge pull request #1524 in BA/design from ~FANGLEI/design:release/9.0 to release/9.0
* commit '0129ddc8ad7cd9c7e32d1eef752f09c5e6fbf5ac':
MOBILE-7081 修复9.0表单body里移动端的控件顺序不能拖动的bug
|
8 years ago |
方磊
|
0129ddc8ad
|
Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~fanglei/design into release/9.0
|
8 years ago |
方磊
|
e26f3bbd52
|
MOBILE-7081 修复9.0表单body里移动端的控件顺序不能拖动的bug
|
8 years ago |
superman
|
6a37be3a98
|
Merge pull request #1523 in BA/design from ~JU/9.0release-design:release/9.0 to release/9.0
* commit 'e24096f4383479a1d96491ae684f5b396c3f0c53':
REPORT-5885 插件安装卸载——frm图表界面图标没有实时刷新 环境和插件变更时都刷新
|
8 years ago |
ju
|
e24096f438
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
8 years ago |
ju
|
473bb799ab
|
REPORT-5885 插件安装卸载——frm图表界面图标没有实时刷新
环境和插件变更时都刷新
|
8 years ago |
superman
|
9ad4ca7e33
|
Merge pull request #1520 in BA/design from ~RINOUX/design:release/9.0 to release/9.0
* commit 'bf73cefa8c4ed83d383bb0b33d970a62b9d25894':
REPORT-5942 回滚代码,改提交到dev
|
8 years ago |
superman
|
c02de9ab10
|
Merge pull request #1519 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0
* commit '0f271555e10e8b060a439ce33a20470119c78127':
CHART-1844 面板调整
|
8 years ago |
rinoux
|
bf73cefa8c
|
REPORT-5942 回滚代码,改提交到dev
|
8 years ago |
superman
|
303351ce9e
|
Merge pull request #1517 in BA/design from ~NEIL/design:release/9.0 to release/9.0
* commit '8c13f7b3b14ae0c7e1ba21a3e82bf848f556e03c':
无JIRA任务,8 -> 9
|
8 years ago |
superman
|
8e72f0e3f1
|
Merge pull request #1518 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0
* commit 'd627183a08a6392a80c25853689b935f9c76ca5d':
REPORT-5945 表单切换到绝对布局时,组件缩放重置为双向自适应=>9.0因代码结构变动,切换不生效
|
8 years ago |
mengao
|
0f271555e1
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
8 years ago |
mengao
|
caea2b6275
|
CHART-1844 面板调整
|
8 years ago |
plough
|
d627183a08
|
REPORT-5945 表单切换到绝对布局时,组件缩放重置为双向自适应=>9.0因代码结构变动,切换不生效
|
8 years ago |
neil
|
8c13f7b3b1
|
无JIRA任务,8 -> 9
|
8 years ago |
superman
|
0b1c35bbd6
|
Merge pull request #1514 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0
* commit 'dbcf42a4ec911a3f03c8a30a13f6a031954189de':
图片是在预览时用的,放在chart模块下
|
8 years ago |
mengao
|
dbcf42a4ec
|
图片是在预览时用的,放在chart模块下
|
8 years ago |
superman
|
ded4b72eee
|
Merge pull request #1512 in BA/design from ~JU/9.0release-design:release/9.0 to release/9.0
* commit '07156f69ac5b9be63153eb744443d222c2406a22':
REPORT-5885 插件安装卸载——frm图表界面图标没有实时刷新 不应该是在且环境时刷新当前的图表,而是在包含图表的插件变动时刷新
|
8 years ago |
ju
|
07156f69ac
|
REPORT-5885 插件安装卸载——frm图表界面图标没有实时刷新
不应该是在且环境时刷新当前的图表,而是在包含图表的插件变动时刷新
|
8 years ago |
superman
|
19e1cb1ba6
|
Merge pull request #1511 in BA/design from ~RINOUX/design:release/9.0 to release/9.0
* commit '7eff901f2c27b7971ef00a0c22fcf2cb757e705b':
REPORT-5942 9.0性能插件内置
|
8 years ago |
rinoux
|
7eff901f2c
|
REPORT-5942 9.0性能插件内置
|
8 years ago |
superman
|
8b0b14fb38
|
Merge pull request #1510 in BA/design from ~JU/9.0release-design:release/9.0 to release/9.0
* commit 'e73272e22e85432e250062407a97959a52db0432':
REPORT-6001 设计器bat启动,远程到远程服务器,日志里抛错finedb被锁住 远程环境不让用
|
8 years ago |
ju
|
e73272e22e
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
8 years ago |
ju
|
f7a5ea2a5c
|
REPORT-6001 设计器bat启动,远程到远程服务器,日志里抛错finedb被锁住
远程环境不让用
|
8 years ago |
superman
|
e9cb5e56c5
|
Merge pull request #1509 in BA/design from ~VITO/design:release/9.0 to release/9.0
* commit '33b935e3d8839ef117ed269c3ac28fde0774132e':
REPORT-5004 “表单”统一改为“决策报表”2/3
|
8 years ago |
vito
|
33b935e3d8
|
REPORT-5004 “表单”统一改为“决策报表”2/3
|
8 years ago |
superman
|
855acfe21c
|
Merge pull request #1506 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0
* commit '261feb1394cb5fea5527f49a7c4f2f0286871422':
REPORT-5955 [Report]删除悬浮元素后,设计器卡死 之前wu做了释放内存,删除悬浮元素会报nep;删除悬浮元素逻辑改为先setSelection 再 remove
|
8 years ago |
MoMeak
|
261feb1394
|
REPORT-5955 [Report]删除悬浮元素后,设计器卡死
之前wu做了释放内存,删除悬浮元素会报nep;删除悬浮元素逻辑改为先setSelection 再 remove
|
8 years ago |
superman
|
bdd7d3143d
|
Merge pull request #1504 in BA/design from ~KERRY/design:release/9.0 to release/9.0
* commit '39b6cd3b8b04a59c4a737015cb9f838ad5c54184':
REPORT-5954 设计器折叠控件文字渲染调整
|
8 years ago |
kerry
|
39b6cd3b8b
|
Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design into release/9.0
|
8 years ago |
kerry
|
129739d9e1
|
REPORT-5954 设计器折叠控件文字渲染调整
|
8 years ago |
superman
|
536bae19b9
|
Merge pull request #1502 in BA/design from ~KERRY/design:release/9.0 to release/9.0
* commit '989ef0936dc50927cede9e7b7f427c813aad088e':
修改import
REPORT-5954 设计器折叠控件文字渲染调整
|
8 years ago |
kerry
|
989ef0936d
|
修改import
|
8 years ago |
kerry
|
1e81c34af9
|
Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design into release/9.0
|
8 years ago |
kerry
|
e9bcc81883
|
REPORT-5954 设计器折叠控件文字渲染调整
|
8 years ago |
superman
|
9dde83d9a2
|
Merge pull request #1500 in BA/design from ~XIAOXIA/design:release/9.0 to release/9.0
* commit 'fbcd70a73c04f595db4e9f662eef4ed39e92ac95':
REPORT-5793 【9.0】从alphafine进入模板的web属性,显示的都是上一张模板的设置
|
8 years ago |
XiaXiang
|
fbcd70a73c
|
REPORT-5793
【9.0】从alphafine进入模板的web属性,显示的都是上一张模板的设置
|
8 years ago |
superman
|
0923de887d
|
Merge pull request #1497 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0
* commit 'ce67e756d988cf69c83ac71bc262a065f332a236':
REPORT-5832 去掉无用代码
REPORT-5832 表单自适应切到绝对布局后, 需要清理掉一些绝对布局里没有的属性
|
8 years ago |
plough
|
ce67e756d9
|
REPORT-5832 去掉无用代码
|
8 years ago |
plough
|
a04eb1b1d3
|
Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~plough/design into release/9.0
|
8 years ago |
plough
|
82eac484a9
|
REPORT-5832 表单自适应切到绝对布局后, 需要清理掉一些绝对布局里没有的属性
|
8 years ago |
superman
|
ffe8fb700f
|
Merge pull request #1491 in BA/design from ~JU/9.0release-design:release/9.0 to release/9.0
* commit 'f26cf271f0428d39270949866290e4a5bfcec7a2':
REPORT-5894 设计器打开大量带背景的模板后, 关闭, GC后内存没有放掉
REPORT-5894 设计器打开大量带背景的模板后, 关闭, GC后内存没有放掉
|
8 years ago |
ju
|
f26cf271f0
|
REPORT-5894 设计器打开大量带背景的模板后, 关闭, GC后内存没有放掉
|
8 years ago |
ju
|
04e2b236c4
|
REPORT-5894 设计器打开大量带背景的模板后, 关闭, GC后内存没有放掉
|
8 years ago |
superman
|
41440d491f
|
Merge pull request #1488 in BA/design from ~KERRY/design:release/9.0 to release/9.0
* commit '842ece0e82725ecbf2fc78041ee25d38302d3edc':
无jira任务,删除无用import
|
8 years ago |
superman
|
aeff32024b
|
Merge pull request #1489 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0
* commit '3765a5786d8502fe03ce1d18bc571463cbde510c':
REPORT-5840 控件生成和使用填报功能
|
8 years ago |