superman
|
9339b4dd52
|
Merge pull request #1018 in BA/design from ~MANGO/design:release to release
* commit '2369145cbfeff4cf9830093c92e2b7190e5c785e':
合并代码:将图表dev中修改合并到release
|
7 years ago |
mengao
|
2369145cbf
|
合并代码:将图表dev中修改合并到release
|
7 years ago |
superman
|
88d009d447
|
Merge pull request #1013 in BA/design from ~PLOUGH/design:release to release
* commit '5004bd19eebf0d1b9433d9a98062470aa8ba7c0b':
REPORT-3216 日文版的一些翻译和显示问题20170708
|
7 years ago |
plough
|
5004bd19ee
|
REPORT-3216 日文版的一些翻译和显示问题20170708
|
7 years ago |
superman
|
8ba9343645
|
Merge pull request #1011 in BA/design from CHART/design:dev to dev
* commit 'c4d276fce91eca87251c67199af00d77a82b1e50':
修改换行符
修改下接口返回类型
还原代码
地图远程设计的时候在写文件的时候更新mapAttr
代码修改
安装平台内打开插件,图表超链中添加相应的按钮
修改老图表那边数据处理逻辑的一些问题 修改多分类轴bug 添加多分类时监控刷新的处理
去掉没用到的引用
修改返回类型
将Table中的返回类型ArrayList<UIComboBox>改为List<UIComboBox>。
多分类轴整体代码,第一次提交
fix
修改pmd错误
修复pmd错误
修改pmd问题
修复bug:条件显示里设置条件内容为数据列,把对应的数据集删掉后,点击设置的条件属性,页面打不开
pmd
删除标签位置
|
7 years ago |
superman
|
c4d276fce9
|
Merge pull request #11 in CHART/design from ~MANGO/m_design:dev to dev
* commit '65762d17f7e06eff0bcc4243c4dbd81ab3ff3260':
修改换行符
修改下接口返回类型
还原代码
地图远程设计的时候在写文件的时候更新mapAttr
|
7 years ago |
richie
|
bfc231c6c8
|
Merge pull request #1009 in BA/design from ~RICHIE/design:release to release
* commit 'ed461daa1646e72771974d8dffd5d22bb2faae57':
BI-6684 License读取类加密做准备
|
7 years ago |
mengao
|
65762d17f7
|
修改换行符
|
7 years ago |
mengao
|
3afae53347
|
修改下接口返回类型
|
7 years ago |
mengao
|
7963ee5913
|
还原代码
|
7 years ago |
mengao
|
869e5c633e
|
地图远程设计的时候在写文件的时候更新mapAttr
|
7 years ago |
richie
|
ed461daa16
|
BI-6684 License读取类加密做准备
|
7 years ago |
richie
|
bcd4a7dedc
|
增加license
|
7 years ago |
richie
|
b189fa26ab
|
增加license
|
7 years ago |
superman
|
d055c82383
|
Merge pull request #1008 in BA/design from ~HUGH/design:release to release
* commit '06fff3dde04dffca511112a63fbe493e13fc9655':
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
7 years ago |
hugh
|
06fff3dde0
|
SLN-280 规范国际化
|
7 years ago |
hugh
|
8fa56b1367
|
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
7 years ago |
superman
|
7bc62b7d5b
|
Merge pull request #9 in CHART/design from ~MANGO/m_design:dev to dev
* commit '59696f6e66523c09915a9d9071f5a92a9021d0de':
代码修改
安装平台内打开插件,图表超链中添加相应的按钮
|
7 years ago |
mengao
|
59696f6e66
|
代码修改
|
7 years ago |
mengao
|
688334fef9
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~mango/m_design into dev
|
7 years ago |
mengao
|
97d781caaf
|
安装平台内打开插件,图表超链中添加相应的按钮
|
7 years ago |
superman
|
53a73f7407
|
Merge pull request #8 in CHART/design from ~MANGO/m_design:dev to dev
* commit '842f99ec4bb0eb6228b97ad87753c4b0fddb711f':
修改老图表那边数据处理逻辑的一些问题 修改多分类轴bug 添加多分类时监控刷新的处理
|
7 years ago |
mengao
|
842f99ec4b
|
修改老图表那边数据处理逻辑的一些问题
修改多分类轴bug
添加多分类时监控刷新的处理
|
7 years ago |
eason
|
2806e5f68f
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '687cb63b1eaf39006e5251c474218cc2c6a7c1ab':
1
1
REPORT-3272 表单无法保存问题.
REPORT-2825 训练插件button出现了多个
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
【国际化修改】修改了一处翻译。。。。
无JIRA任务, dev国际化->release
【国际化修改】 根据代理商意见修改翻译 syoki
超链悬浮窗图表,点击确定无效,报null错误
【国际化修改】 修改几处翻译问题
BI-5822 调整接口,使用标准的状态码返回给移动端
更改lib依赖
【国际化修改】 根据代理商的意见修改design部分的翻译 庄奇20170606
去掉部分代码
无JIRA任务, 论坛消息屏蔽
|
7 years ago |
superman
|
42806c6e5d
|
Merge pull request #995 in BA/design from ~MANGO/design:release to release
* commit 'b72ecb0af5dbf505763876323557b926283b15ed':
修改拼写错误
|
7 years ago |
mengao
|
b72ecb0af5
|
Merge remote-tracking branch 'origin/release' into release
|
7 years ago |
mengao
|
6819c1c00d
|
修改拼写错误
|
7 years ago |
superman
|
f4577990da
|
Merge pull request #7 in CHART/design from ~MANGO/m_design:dev to dev
* commit '2bc7f74a3c70732bfb35298acd1a6a72499a0026':
去掉没用到的引用
|
7 years ago |
mengao
|
2bc7f74a3c
|
去掉没用到的引用
|
7 years ago |
superman
|
1423b7671f
|
Merge pull request #993 in BA/design from ~NEIL/design:release to release
* commit '896fa76e9598a56fe31673d96ca962937b00527f':
1
REPORT-2825 按钮出现多个, design模块忘了patch了.
REPORT-3272 表单无法保存问题.
|
7 years ago |
neil
|
896fa76e95
|
1
|
7 years ago |
neil
|
2f8a2447a6
|
REPORT-2825 按钮出现多个, design模块忘了patch了.
|
7 years ago |
superman
|
687cb63b1e
|
Merge pull request #992 in BA/design from ~NEIL/design:dev to dev
* commit '9dcd2698c86b4236851d773ea9e5c78ffb1b3abd':
1
1
REPORT-3272 表单无法保存问题.
|
7 years ago |
neil
|
9dcd2698c8
|
1
|
7 years ago |
neil
|
23fd3ad8ef
|
1
|
7 years ago |
neil
|
53aa00aa1a
|
REPORT-3272 表单无法保存问题.
|
7 years ago |
neil
|
eda63515b4
|
REPORT-3272 表单无法保存问题.
|
7 years ago |
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 |
superman
|
748e1af4ba
|
Merge pull request #984 in BA/design from ~NEIL/design:release to release
* commit 'f86e0ee7b738cd4e851be8058cc9b6ac06c32a19':
无JIRA任务, build failed
|
8 years ago |
neil
|
f86e0ee7b7
|
无JIRA任务, build failed
|
8 years ago |
mengao
|
8810f3c695
|
修改返回类型
|
8 years ago |
mengao
|
2aa4fee16e
|
将Table中的返回类型ArrayList<UIComboBox>改为List<UIComboBox>。
|
8 years ago |
mengao
|
9db7c1ddb4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~mango/m_design into dev
|
8 years ago |
mengao
|
b7ca742217
|
多分类轴整体代码,第一次提交
|
8 years ago |
superman
|
e32fdf1387
|
Merge pull request #982 in BA/design from ~PLOUGH/design:release to release
* commit '62066d4e953d9a125e584007a1ff81ddab9b4adb':
REPORT-3184 设计器安装后默认工作目录的名字
|
8 years ago |
plough
|
62066d4e95
|
REPORT-3184 设计器安装后默认工作目录的名字
|
8 years ago |
superman
|
3f0bd44ab2
|
Merge pull request #980 in BA/design from ~SYOKI/design:release to release
* commit '6b7f98b513d22d571814158b468b53af4689f638':
【日语国际化修改】
|
8 years ago |
syoki
|
6b7f98b513
|
【日语国际化修改】
|
8 years ago |
superman
|
da38cb04bb
|
Merge pull request #977 in BA/design from ~MANGO/design:release to release
* commit '32d5c1bf20a0b3a46fef3a3a6143d03ce04f34e7':
gis地图切换经纬度后,经纬度面板不现实bug
|
8 years ago |
mengao
|
32d5c1bf20
|
gis地图切换经纬度后,经纬度面板不现实bug
|
8 years ago |