superman
|
baaf67bb38
|
Merge pull request #6 in CHART/design from ~MANGO/m_design:dev to dev
* commit '8810f3c6956e3e2fc9cab3731eee052bb2b732aa':
修改返回类型
将Table中的返回类型ArrayList<UIComboBox>改为List<UIComboBox>。
多分类轴整体代码，第一次提交
|
7 years ago |
mengao
|
8810f3c695
|
修改返回类型
|
7 years ago |
|
mengao
|
2aa4fee16e
|
将Table中的返回类型ArrayList<UIComboBox>改为List<UIComboBox>。
|
7 years ago |
|
mengao
|
9db7c1ddb4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~mango/m_design into dev
|
7 years ago |
|
mengao
|
b7ca742217
|
多分类轴整体代码，第一次提交
|
7 years ago |
eason
|
6220d7d2d8
|
Merge pull request #5 in CHART/design from ~MANGO/m_design:dev to dev
* commit '58bc5e247e1f26c0288d5e65af6af5cb3e6b4ac0':
修改pmd错误
修复pmd错误
修改pmd问题
修复bug：条件显示里设置条件内容为数据列，把对应的数据集删掉后，点击设置的条件属性，页面打不开
|
7 years ago |
sunmondong
|
58a009ed10
|
fix
|
7 years ago |
|
mengao
|
58bc5e247e
|
修改pmd错误
|
7 years ago |
|
mengao
|
382268234d
|
修复pmd错误
|
7 years ago |
|
mengao
|
c5536e6d61
|
修改pmd问题
|
7 years ago |
|
mengao
|
b70af41d1b
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
mengao
|
5a490cf8dd
|
修复bug：条件显示里设置条件内容为数据列，把对应的数据集删掉后，点击设置的条件属性，页面打不开
|
7 years ago |
|
eason
|
cd0440cad3
|
Merge pull request #3 in CHART/design from ~EASON/design:dev to dev
* commit 'de3fbb5cabd0ca2ca9b076b9c06b91e1bc46ad9e':
pmd
删除标签位置
|
7 years ago |
eason-skx
|
de3fbb5cab
|
pmd
|
7 years ago |
|
eason-skx
|
383431e7dd
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~eason/design into dev
|
7 years ago |
|
eason-skx
|
6213784e43
|
删除标签位置
|
7 years ago |
|
superman
|
9e121eaedd
|
Merge pull request #934 in BA/design from CHART/design:dev to dev
* commit '2dc75dacfb5aa81bc1eb3f627d4cd840f094bd7c':
删除多余类
去掉多余代码
去掉接口代码中instnceof，用泛型代替。
|
7 years ago |
|
superman
|
ba967dd4f0
|
Merge pull request #929 in BA/design from ~PLOUGH/design:dev to dev
* commit '3f655e7a0f0aa4d6ffe59e27a285f3bebfb2973a':
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
plough
|
3f655e7a0f
|
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
|
eason
|
2dc75dacfb
|
Merge pull request #1 in CHART/design from ~MANGO/m_design:dev to dev
* commit 'ff20b64864d8119fddbd548f911c4da5e19db760':
删除多余类
去掉多余代码
去掉接口代码中instnceof，用泛型代替。
|
7 years ago |
|
superman
|
5deeddb813
|
Merge pull request #925 in BA/design from ~PLOUGH/design:dev to dev
* commit 'd70e9db8be9647ffe3fec3266d6ae11191017963':
REPORT-2561 大屏-数字时钟插件，属性表左移，调整
|
7 years ago |
|
plough
|
d70e9db8be
|
REPORT-2561 大屏-数字时钟插件，属性表左移，调整
|
7 years ago |
|
superman
|
e50b8f99f8
|
Merge pull request #923 in BA/design from ~PLOUGH/design:dev to dev
* commit '5dda04e93b7a2e83a057d5abd171a02e18b41316':
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
|
plough
|
5dda04e93b
|
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
|
superman
|
b9eeb8996f
|
Merge pull request #919 in BA/design from ~JU/ba-dev-design:dev to dev
* commit 'f18b20cd96bf6cb86ca5e0fc7968eda974949d12':
比较版本号
版本比较： 10.0 > 9.0 1.10 > 1.9 1.1.2 > 1.1.1 1.1.1 > 1.1
|
7 years ago |
juhaoyu
|
f18b20cd96
|
比较版本号
|
7 years ago |
|
juhaoyu
|
e51f528646
|
版本比较：
10.0 > 9.0
1.10 > 1.9
1.1.2 > 1.1.1
1.1.1 > 1.1
|
7 years ago |
|
mengao
|
ff20b64864
|
删除多余类
|
7 years ago |
|
mengao
|
30bae7a43f
|
去掉多余代码
|
7 years ago |
|
mengao
|
db283848a0
|
去掉接口代码中instnceof，用泛型代替。
|
7 years ago |
|
superman
|
225ec2de75
|
Merge pull request #913 in BA/design from ~NEIL/design:dev to dev
* commit '59180e23e36ffbfd7978d686b2d31678f66d0f7e':
无JIRA任务， 国际化合并
|
7 years ago |
neil
|
59180e23e3
|
无JIRA任务， 国际化合并
|
7 years ago |
|
superman
|
599423bc16
|
Merge pull request #909 in BA/design from ~HZZZ/design:fix-REPORT-2811 to dev
* commit 'd618b70f1e6a31a2906851af70a3c903bba6eb0d':
fix
use UIPopupMenu
PMD
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
7 years ago |
hzzz
|
d618b70f1e
|
fix
|
7 years ago |
|
hzzz
|
b8fbd2ecc0
|
use UIPopupMenu
|
7 years ago |
|
hzzz
|
9d84491d12
|
PMD
|
7 years ago |
|
hzzz
|
f8932e2f28
|
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
7 years ago |
|
superman
|
dcf9a44b08
|
Merge pull request #907 in BA/design from ~HZZZ/design:reset-before-2773 to dev
* commit '5b17a17e85a5fdc382644ee7663bd1863cb379e0':
back 2
back 1
|
7 years ago |
|
hzzz
|
5b17a17e85
|
back 2
|
7 years ago |
|
hzzz
|
71b44df358
|
back 1
|
7 years ago |
|
superman
|
fd1d2d76b4
|
Merge pull request #906 in BA/design from ~MANGO/design:dev to dev
* commit 'de88676473718e3791828128c4fc2bd141267485':
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
7 years ago |
|
mengao
|
de88676473
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
mengao
|
8d64d45fc3
|
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
7 years ago |
|
superman
|
d30d8bfc7b
|
Merge pull request #903 in BA/design from ~HZZZ/design:fix-REPORT-2773 to dev
* commit 'ac5976346ac2ce30299cf629d062c78ed029e458':
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
|
7 years ago |
|
superman
|
68bbb0927c
|
Merge pull request #904 in BA/design from ~NEIL/design:dev to dev
* commit '8555ab940f5325cb63cd5c0f8d11f57fec2ea364':
无JIRA任务， build failed
|
7 years ago |
|
neil
|
8555ab940f
|
无JIRA任务， build failed
|
7 years ago |
|
hzzz
|
ac5976346a
|
PMD
|
7 years ago |
|
hzzz
|
e784491bdd
|
PMD
|
7 years ago |
|
hzzz
|
d35287a513
|
PMD
|
7 years ago |
|
hzzz
|
500b837aaf
|
PMD
|
7 years ago |
