superman
4766b28c54
Merge pull request #12827 in DESIGN/design from final/10.0 to release/10.0
...
* commit '42ab4686b261159669b5bb3dd004adf00be09aa4':
1 year ago
superman
42ab4686b2
Merge pull request #12824 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'a83143a70142f959ef3c112d766e60d5dabc4961':
REPORT-105614 设计器去除webroot/druid服务
1 year ago
superman
a83143a701
Merge pull request #12823 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '1bd3daee809b279584cf9be96e1da067e0f636e8':
1 year ago
superman
1bd3daee80
Merge pull request #12807 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7f68ab323f3f9779677b07ba01d1ffb6fffd8cb6':
REPORT-105614 设计器去除webroot/druid服务
1 year ago
vito-刘恒霖
7f68ab323f
Pull request #12804 : REPORT-105614 设计器去除webroot/druid服务
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '8c9f48a2dcd524d895dc73c30c11ea396b8a62de':
REPORT-105614 设计器去除webroot/druid服务
1 year ago
vito
8c9f48a2dc
REPORT-105614 设计器去除webroot/druid服务
1 year ago
superman
66765c0877
Merge pull request #12679 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '407e856b51325c401c0c02f4ca030bcc59413e30':
1 year ago
superman
407e856b51
Merge pull request #12678 in DESIGN/design from final/10.0 to release/10.0
...
* commit '7a47e673f3d149cffdfe03acb4e6ee3baba12fa5':
1 year ago
superman
7a47e673f3
Merge pull request #12677 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '02ee81d97bc226bd47c91447fce406e80040ffe0':
1 year ago
superman
02ee81d97b
Merge pull request #12676 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'cad095237a95304bee2e14b931069dae259b39bb':
1 year ago
superman
9528cb10cc
Merge pull request #12642 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c250412a0f07694849fbb14b54f9b3c23e2a437e':
1 year ago
superman
c250412a0f
Merge pull request #12641 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'cad095237a95304bee2e14b931069dae259b39bb':
1 year ago
superman
cad095237a
Merge pull request #12639 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'cad8e69f9669ad06db56ec23ac7fc8cab84bacba':
1 year ago
superman
cad8e69f96
Merge pull request #12638 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '788f43a93ca6e28cec94c81f691557598e6c4337':
1 year ago
superman
788f43a93c
Merge pull request #12568 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd62bca7e6e9f7a76866c87055518c2ad6e1f70b9':
1 year ago
superman
d62bca7e6e
Merge pull request #12567 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'd439e124f83678c2561105dc29f6c8ad092bb8ef':
1 year ago
superman
d439e124f8
Merge pull request #12566 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9c9014e706e1173b15bf3d3ed8382c7bfb58c795':
1 year ago
superman
9c9014e706
Merge pull request #12559 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'df09c457a799a83332a3c5fb6e56cc9c58f58698':
1 year ago
superman
b593d31a55
Merge pull request #12540 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '36ce5ffa84a9d0c025ac0a0dea6acfbe2d795179':
1 year ago
superman
36ce5ffa84
Merge pull request #12539 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'df09c457a799a83332a3c5fb6e56cc9c58f58698':
1 year ago
superman
df09c457a7
Merge pull request #12537 in DESIGN/design from release/10.0 to final/10.0
...
* commit '1c7de76505b39e6c5e39d0815b376b9be1a0424b':
1 year ago
superman
1c7de76505
Merge pull request #12536 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'f1d8a5d9f4b1930b94564be692cb98aec06c6783':
1 year ago
superman
f1d8a5d9f4
Merge pull request #12390 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '3220fbea5e0986a435dea78c29d842ee48d8f155':
1 year ago
superman
3220fbea5e
Merge pull request #12389 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3bec9ec93ef36648d1f90aff3ca04e9b9cb1ed82':
1 year ago
superman
3bec9ec93e
Merge pull request #12388 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '71b4270fcb49291fcc88a2977f1af46df52594e8':
1 year ago
superman
71b4270fcb
Merge pull request #12385 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '68e9be81ca31e0f329fca964e95ff17159d6a4c3':
REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
1 year ago
superman
19e7d20681
Merge pull request #12328 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '44d0bc8099fa16e1cdd55b0f090c95925bc4a1fd':
1 year ago
superman
44d0bc8099
Merge pull request #12327 in DESIGN/design from final/10.0 to release/10.0
...
* commit '68e9be81ca31e0f329fca964e95ff17159d6a4c3':
1 year ago
superman
68e9be81ca
Merge pull request #12325 in DESIGN/design from release/10.0 to final/10.0
...
* commit '313cc2aa226d301c89f7769917bd5057947f7af4':
1 year ago
superman
313cc2aa22
Merge pull request #12324 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'a22c2d887e962aac2fde8debc2c06480aa0f65db':
1 year ago
superman
a22c2d887e
Merge pull request #12259 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f1d0d2f491ad4974cf8aed42ab9df531ea93773e':
REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
1 year ago
superman
f1d0d2f491
Merge pull request #12258 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3a0d7a6a59169c05cf553420ad50157557506986':
REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
1 year ago
superman
3a0d7a6a59
Merge pull request #12257 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'e3b1531e63fff3ccca0af52fc4c5db6f5e478bca':
1 year ago
Destiny.Lin-林锦龙
600047f1f6
Pull request #12242 : REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
...
Merge in DESIGN/design from ~DESTINY.LIN/design:final/10.0 to final/10.0
* commit 'eed4de1f694f910af5800325ed77a0c7720b1341':
REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
1 year ago
Destiny.Lin
eed4de1f69
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
1 year ago
Destiny.Lin
8b4c1ebb32
REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
1 year ago
superman
e3b1531e63
Merge pull request #12238 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '99acac0f729c79bc748910ba8c552fc526cf421b':
REPORT-94629 设计器tab组件操作异常
1 year ago
superman
d3272c4e1e
Merge pull request #12208 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c369b15b686dbdedb6138925dea7f2d7b9118ddc':
1 year ago
superman
c369b15b68
Merge pull request #12207 in DESIGN/design from final/10.0 to release/10.0
...
* commit '99acac0f729c79bc748910ba8c552fc526cf421b':
1 year ago
superman
99acac0f72
Merge pull request #12205 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'a3343bcc931da388200ec81a2d37546ec1feed86':
REPORT-94629 设计器tab组件操作异常
1 year ago
superman
a3343bcc93
Merge pull request #12204 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'c4870e82229cb4c879949b8f5625090b0f4b549e':
1 year ago
superman
c4870e8222
Merge pull request #12137 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '749941f5077439b0555dbeea56219ce6b16d3145':
REPORT-94629 设计器tab组件操作异常
1 year ago
Coral.Chen-张晨
749941f507
Pull request #12122 : REPORT-94629 设计器tab组件操作异常
...
Merge in DESIGN/design from ~CORAL.CHEN/design:release/10.0 to release/10.0
* commit '1a1dd2b9f09709f500b230f80c7a3cf011834e8c':
REPORT-94629 设计器tab组件操作异常
2 years ago
coral.chen@fanruan.com
1a1dd2b9f0
REPORT-94629 设计器tab组件操作异常
2 years ago
superman
53ffd6c537
Merge pull request #12094 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '81ad7f564a5955d4aae6076a950cde976ed16216':
2 years ago
superman
81ad7f564a
Merge pull request #12093 in DESIGN/design from final/10.0 to release/10.0
...
* commit '5c7f634e6c1f5e23cd34cddade618e0aec5a246e':
2 years ago
superman
5c7f634e6c
Merge pull request #12092 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '4ca379d78c8675e5ac84b5a282a7274ef4167dea':
2 years ago
superman
4ca379d78c
Merge pull request #12090 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '42339dbe9bb5352c3c5fbbcc16fd7fbf239bed42':
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项 改用ListMap
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项
REPORT-94114 设计器面板图表超链选项缺失 修改 报表块超链选项
REPORT-94114 设计器面板图表超链选项缺失 【问题原因】没有判断当前是决策报表图表还是普通报表图表,两者的超链选项不同 【改动思路】增加判断当前报表类型
REPORT-82787 图表空数据提示配置页面,默认图片需补充繁中版
2 years ago
superman
7a6ac53d9e
Merge pull request #12082 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '27d3ddffa1ab74177118b4adfbf8da2b7f17e671':
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项 改用ListMap
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项
2 years ago
superman
27d3ddffa1
Merge pull request #12081 in DESIGN/design from final/10.0 to release/10.0
...
* commit '42339dbe9bb5352c3c5fbbcc16fd7fbf239bed42':
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项 改用ListMap
REPORT-94597 安装【平台内打开标签页】插件,FR图表超链会多两个重复下拉项
2 years ago