superman
b1bd2cccb7
Merge pull request #8939 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'a099c6a5bb0d76edb68d56c0760f61d010009c05':
3 years ago
superman
a099c6a5bb
Merge pull request #8935 in DESIGN/design from release/10.0 to final/10.0
...
* commit '2576e5ecc2cc9dd2c89afab9545c13208c7e7963':
3 years ago
superman
2576e5ecc2
Merge pull request #8934 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '87cb671caa5cc401d7a52e739aecd28fe77c04b2':
3 years ago
superman
0aac39936a
Merge pull request #8921 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'd84f7a9b05acad1ddff2c8246f534a260fb384e0':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-70011 国际化适配
REPORT-68607 数据连接配置操作放事务
3 years ago
superman
87cb671caa
Merge pull request #8924 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd84f7a9b05acad1ddff2c8246f534a260fb384e0':
3 years ago
superman
d84f7a9b05
Merge pull request #8920 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '15dfd4fafb061d49319f717f8f2442f05fb41164':
3 years ago
superman
15dfd4fafb
Merge pull request #8912 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6b0aaebc7b081d3e90f4bce340235ad889f58dda':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
fanglei
6b0aaebc7b
Pull request #8909 : REPORT-69532 10.0创建复用组件超出960*540时,给出提示
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '236dece1d88d2e6ea1e1e3da704864438b95574a':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
3 years ago
Hades
fc0fc54887
Pull request #8907 : REPORT-67417 运营产品v1.0 同步一份到10.0
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'aba9f7d5a3b471c18c9e53067d42ec1c22ffbcfc':
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
3 years ago
方磊
236dece1d8
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
3 years ago
hades
aba9f7d5a3
REPORT-67417 运营产品v1.0 bug patch
3 years ago
hades
cc5d9910dc
REPORT-67417 运营产品v1.0 同步一份到10.0
3 years ago
Hades
38fa734e03
Pull request #8904 : REPORT-71425 websocket断开优化 同步到10.0.19.13
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '527618f35a6891c8cfe7406f4e93b11224d44c17':
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
hades
527618f35a
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
superman
38fea499b0
Merge pull request #8897 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '10b485c3943aab1c45c1cd48c12ddf10517c181f':
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-68607 数据连接配置操作放事务
3 years ago
rinoux
10b485c394
Pull request #8894 : REPORT-69285 数据连接安全关键字检查拦截 10.0
...
Merge in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
* commit '6a9c978a391e10b76d87cd5953e285ce2ed502c5':
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-68607 数据连接配置操作放事务
3 years ago
rinoux
6a9c978a39
REPORT-69285 数据连接安全关键字检查拦截
3 years ago
rinoux
06346c31cd
REPORT-69285 数据连接安全关键字检查拦截
3 years ago
rinoux
f8a3043eda
REPORT-69285 数据连接安全关键字检查拦截
3 years ago
superman
00a6581bf8
Merge pull request #8840 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '66873a06eae9bf58a77b072f2a74dbf5b690918e':
REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
3 years ago
superman
66873a06ea
Merge pull request #8839 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2f5846e1944d2e78f22028959737443634aaedd3':
REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
3 years ago
Hades
2f5846e194
Pull request #8835 : REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '26c3c48f3f578ab8eff16c2b02ed4ffc0e109153':
REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
3 years ago
hades
26c3c48f3f
REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
3 years ago
superman
dd71d3645b
Merge pull request #8825 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c558e41f49560c406a21267898b7adc9c3ae9e66':
3 years ago
superman
c558e41f49
Merge pull request #8824 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'c72b99bca8d5ea3124b5740540cf448744e555dd':
3 years ago
superman
c72b99bca8
Merge pull request #8823 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'f7cc136e83cabd053b66cc0ed7c43885ac0fc253':
3 years ago
superman
f7cc136e83
Merge pull request #8820 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '93ee6f8d444a85775719df0e5e0714d6a0d1b9c1':
3 years ago
Link.Zhao
3eadc4016c
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit 'd3988b4ff3e0445a88b49582588f576fa21fff62':
REPORT-70011 国际化适配
REPORT-70092 重定向报错,帮助文档跳转异常
REPORT-69229 设计器偶发启动不了
REPORT-69163 新安装的kr设计器 无法使用frm
REPORT-68443 聚合报表报表块单元格也可以进行权限编辑
REPORT-69009 mac新系统下getSelectedFiles方法返回为空
updated
REPORT-68607 数据连接全量保存改为增量保存
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
3 years ago
superman
d27fe65d71
Merge pull request #8718 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd3988b4ff3e0445a88b49582588f576fa21fff62':
REPORT-70011 国际化适配
3 years ago
superman
d3988b4ff3
Merge pull request #8717 in DESIGN/design from final/10.0 to release/10.0
...
* commit '93ee6f8d444a85775719df0e5e0714d6a0d1b9c1':
3 years ago
superman
93ee6f8d44
Merge pull request #8716 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'a3696d02cff0c49f5909310763def2bdd57714ac':
3 years ago
kerry
bda5c504eb
Pull request #8703 : REPORT-70011 国际化适配
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '1bf0d00c4ad2aeb8fe35fdbd4bfd56c0768f93eb':
REPORT-70011 国际化适配
3 years ago
superman
a3696d02cf
Merge pull request #8714 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'acfad77e02e5e218a2a163f4947f7d1995d4c98c':
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
superman
0e705cce0d
Merge pull request #8706 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '3040073f234552df252705566a0a4520e050f5ca':
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
superman
3040073f23
Merge pull request #8705 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'acfad77e02e5e218a2a163f4947f7d1995d4c98c':
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
kerry
1bf0d00c4a
REPORT-70011 国际化适配
3 years ago
Hades
acfad77e02
Pull request #8701 : REPORT-70503 重定向报错,帮助文档跳转异常 同步到10.0
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '43896269763ca597d50fa49adb20d32eed61e4cd':
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
hades
4389626976
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
superman
5e3b24ac93
Merge pull request #8672 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '0e42766cba40665540e34e113180f9e0982448bd':
3 years ago
superman
0e42766cba
Merge pull request #8671 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ce1fc428413f43d33bfb4a856fa91ad9bc8da48f':
3 years ago
superman
ce1fc42841
Merge pull request #8667 in DESIGN/design from release/10.0 to final/10.0
...
* commit '4c104556c0fc727d7994d64637b448e6d1155edc':
3 years ago
superman
4c104556c0
Merge pull request #8666 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '6aa3eb830dd3fd258e410a96d07851da06ffeb41':
3 years ago
superman
6aa3eb830d
Merge pull request #8609 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b628a5355c257c9e53f1c4362b09e0fdfedcb8f8':
3 years ago
superman
b628a5355c
Merge pull request #8608 in DESIGN/design from final/10.0 to release/10.0
...
* commit '65acc106a19ca795cdd7ed5171de0861db1ef6e5':
3 years ago
superman
65acc106a1
Merge pull request #8607 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'ac2f22ce670a6ab86b7c86ebdc54820ff7c747c4':
3 years ago
superman
ac2f22ce67
Merge pull request #8605 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'e6120fc1129fba72c6210abdc0b5b93f28eaef39':
REPORT-69229 设计器偶发启动不了
REPORT-68443 聚合报表报表块单元格也可以进行权限编辑
REPORT-69009 mac新系统下getSelectedFiles方法返回为空
updated
REPORT-68607 数据连接全量保存改为增量保存
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
3 years ago
superman
1b48359989
Merge pull request #8566 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '61e9b803bf20ac71010f58a7f2a905be5ee6021d':
3 years ago
superman
61e9b803bf
Merge pull request #8565 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e6120fc1129fba72c6210abdc0b5b93f28eaef39':
3 years ago
superman
e6120fc112
Merge pull request #8559 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'f501af9b0b0484b220a0fdc8ca25a89d101e7582':
REPORT-69229 设计器偶发启动不了
REPORT-68443 聚合报表报表块单元格也可以进行权限编辑
REPORT-69009 mac新系统下getSelectedFiles方法返回为空
updated
REPORT-68607 数据连接全量保存改为增量保存
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
3 years ago
superman
f501af9b0b
Merge pull request #8558 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '11dd3bdcc05291fbe1a7da61f5a55432369f6c49':
3 years ago