Harrison
|
7e2851e146
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into release/10.0
Conflicts:
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
|
5 years ago |
Harrison
|
9c07d30293
|
REPORT-25577 数据集插件禁用启用之后原本设置的数据集配置再次打开变成空白
保持打开当前模板时,数据集插件的残留。
需要重新打开当前模板,才能刷新。
|
5 years ago |
hades
|
c30722518f
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
fba0403899
|
MOBILE-24587 组件快速定位 && DesignTableManager 判空
|
5 years ago |
Lanlan
|
8b233b678a
|
Merge pull request #1372 in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '4be4bc6e80449c8597cfbc37ab447dcfc0d78ef4':
REPORT-25522 修改设计器的日期后,更新推送消息没有弹出
|
5 years ago |
Lanlan
|
4be4bc6e80
|
REPORT-25522 修改设计器的日期后,更新推送消息没有弹出
|
5 years ago |
Lanlan
|
cbefd0422b
|
Merge pull request #1371 in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '43609c951816cf5bfee0365556990fc1640c3735':
REPORT-24689 设计器更新的推送弹窗关闭按钮异常
|
5 years ago |
Lanlan
|
43609c9518
|
REPORT-24689 设计器更新的推送弹窗关闭按钮异常
|
5 years ago |
Hades
|
d73d53bd7b
|
Merge pull request #1370 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'cf7bd5c4e738724fe2b37d835ea00d3e54ef92d5':
REPORT-24141 内存数据库snappydata下拉展示数据列表,以及切换过滤的时候,速度很慢
|
5 years ago |
hades
|
cf7bd5c4e7
|
REPORT-24141 内存数据库snappydata下拉展示数据列表,以及切换过滤的时候,速度很慢
|
5 years ago |
Hades
|
0431084a80
|
Merge pull request #1368 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '6f27c10428be5070c8292e30788376950693bb30':
fix import
REPORT-24206_设计器_修改边框颜色单元格背景颜色会变统一
|
5 years ago |
hades
|
6f27c10428
|
fix import
|
5 years ago |
hades
|
8bccab743c
|
REPORT-24206_设计器_修改边框颜色单元格背景颜色会变统一
|
5 years ago |
Hades
|
ec0c4a4b32
|
Merge pull request #1366 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'd5e8daefd1699164e44991041d597e1a67276444':
REPORT-25159 单元格元素-高级-显示值,删除公式后点击撤销公式显示会丢失
|
5 years ago |
Hades
|
d5e8daefd1
|
Merge pull request #21 in ~HADES/design from ~JOE.JIANG/design:REPORT-25159 to release/10.0
* commit 'c9a8b7dc90a9b7cfbe7eb980984aa94227eaef34':
REPORT-25159 单元格元素-高级-显示值,删除公式后点击撤销公式显示会丢失
|
5 years ago |
Joe.Jiang
|
c9a8b7dc90
|
REPORT-25159 单元格元素-高级-显示值,删除公式后点击撤销公式显示会丢失
|
5 years ago |
Hades
|
ead5ac1c66
|
Merge pull request #1365 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '40e62b014f2aa7f027fc41da1453df158842df3a':
REPORT-21556 导入excel不显示数据
|
5 years ago |
hades
|
40e62b014f
|
REPORT-21556 导入excel不显示数据
|
5 years ago |
Hades
|
8549c39c74
|
Merge pull request #1364 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'e07c44a6296840978daa308ee204444049d3d743':
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
|
5 years ago |
Hades
|
e07c44a629
|
Merge pull request #20 in ~HADES/design from ~JOE.JIANG/design:bugfix/10.0 to bugfix/10.0
* commit 'f36bfb1cf014f8e0e3e5c9b8dc67cae4a9daabd9':
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
|
5 years ago |
Hades
|
8d1076562e
|
Merge pull request #1362 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '1823a7bcbdb1a731071f67352c4667dc19f7a646':
REPORT-24294 安装10设计器启动之后,操作异常缓慢
|
5 years ago |
Hades
|
6a2ada1667
|
Merge pull request #1363 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a0cf1e74aad65bee150f25c489cc8664d6943e42':
REPORT-25080 [10.0]英文操作系统启动设计器,启动画面鸣谢模块展示不全
|
5 years ago |
Joe.Jiang
|
f36bfb1cf0
|
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
|
5 years ago |
Hades
|
a0cf1e74aa
|
Merge pull request #19 in ~HADES/design from ~JOE.JIANG/design:REPORT-25080 to release/10.0
* commit '458819a04648aa00ca7e47b569bfdcac0386370e':
REPORT-25080 [10.0]英文操作系统启动设计器,启动画面鸣谢模块展示不全
|
5 years ago |
Joe.Jiang
|
63ac2590df
|
Merge branch 'bugfix/10.0' of ssh://cloud.finedevelop.com:7999/~joe.jiang/design into bugfix/10.0
|
5 years ago |
hades
|
1823a7bcbd
|
REPORT-24294 安装10设计器启动之后,操作异常缓慢
|
5 years ago |
kerry
|
9b400bac0e
|
Merge pull request #1360 in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit '4f24288c06c345e9e9eaa70d458b7de2544839bf':
REPORT-24117 这部分代码回退,当时的bug REPORT-21202修改FormSelection就可以避免tab的复制
|
5 years ago |
Bryant
|
f53ca49842
|
Merge pull request #1361 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit '23cca4f342da97ae0581b2e3cd1a3bb9c678bcd4':
无jira任务 加一下日志
|
5 years ago |
Joe.Jiang
|
f5148f8323
|
REPORT-24787 决策报表修改数据集名称,单元格不会跟随修改
|
5 years ago |
Bryant
|
23cca4f342
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
Bryant
|
bf415b4b13
|
无jira任务 加一下日志
|
5 years ago |
kerry
|
4f24288c06
|
REPORT-24117 这部分代码回退,当时的bug REPORT-21202修改FormSelection就可以避免tab的复制
|
5 years ago |
Joe.Jiang
|
458819a046
|
REPORT-25080 [10.0]英文操作系统启动设计器,启动画面鸣谢模块展示不全
|
5 years ago |
Lucian.Chen
|
ed7c985a57
|
Merge pull request #1359 in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '1ed4b23dab59715edfd9aa1c53660cbb1348a81b':
REPORT-24826 远程设计时点击产品演示,远程设计断开
|
5 years ago |
lucian
|
1ed4b23dab
|
REPORT-24826 远程设计时点击产品演示,远程设计断开
|
5 years ago |
kerry
|
b09a206da6
|
Merge pull request #1357 in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit 'c58b21eb637339e06106d75b731f2bf2a3a790b4':
REPORT-24957 frm打不开
|
5 years ago |
pengda
|
88227c0de5
|
Merge pull request #1356 in DESIGN/design from ~PENGDA/design:bugfix/10.0 to bugfix/10.0
* commit 'b291054cc2abdb49e55f9ec07519178e10ef9730':
REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题
|
5 years ago |
kerry
|
c58b21eb63
|
REPORT-24957 frm打不开
|
5 years ago |
Kara
|
062b857659
|
Merge pull request #1354 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '69fee8f6786f8b5d11b91dd6391b68bd1c06ff20':
MOBILE-24561 通过箭头按钮触发下拉框,进行修改,会导致保存失败
|
5 years ago |
pengda
|
b291054cc2
|
REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题
|
5 years ago |
Hades
|
ab4872cbd6
|
Merge pull request #1353 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '445de1471b9d26dcbad87faf0fc34097ed2c219d':
MOBILE-24561 通过箭头按钮触发下拉框,进行修改,会导致保存失败
|
5 years ago |
Maksim
|
63a005241f
|
Merge pull request #1351 in DESIGN/design from ~MAKSIM/design:bugfix/10.0 to bugfix/10.0
* commit '10c82630ee87b0b64a708a15b65e63a0be56f8cd':
增加单元测试
创建socket增加失败重试
|
5 years ago |
hades
|
69fee8f678
|
MOBILE-24561 通过箭头按钮触发下拉框,进行修改,会导致保存失败
|
5 years ago |
Maksim
|
10c82630ee
|
增加单元测试
|
5 years ago |
hades
|
445de1471b
|
MOBILE-24561 通过箭头按钮触发下拉框,进行修改,会导致保存失败
|
5 years ago |
Kara
|
360bb86cdd
|
Merge pull request #1352 in DESIGN/design from ~PENGDA/design:final/10.0 to final/10.0
* commit '6c266e4cca69ae136ca13bc65a49bfd4dd4f7c31':
REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题
|
5 years ago |
pengda
|
6c266e4cca
|
REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题
|
5 years ago |
Hades
|
646b7623a1
|
Merge pull request #1350 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'c1991e9b1f099c5ab013d45e08dcf4c79638b91c':
REPORT-24478 预定义控件设置不可用不可见后预览无效
REPORT-24478 预定义控件设置不可用不可见后预览无效
REPORT-24478 预定义控件设置不可用不可见后预览无效
|
5 years ago |
Maksim
|
06cb403feb
|
创建socket增加失败重试
|
5 years ago |
Hades
|
c1991e9b1f
|
Merge pull request #14 in ~HADES/design from ~JOE.JIANG/design:REPORT-24478 to release/10.0
* commit '35fdd38f46f16d26a1fb10c1fc73830381df780f':
REPORT-24478 预定义控件设置不可用不可见后预览无效
REPORT-24478 预定义控件设置不可用不可见后预览无效
REPORT-24478 预定义控件设置不可用不可见后预览无效
|
5 years ago |