superman
638ec61e06
Merge pull request #8248 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '975d8aed81cef44d9c3db92e1a0010731269dd48':
3 years ago
superman
975d8aed81
Merge pull request #8247 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '52951bf1cf4f59ad45251cdd7b0e11ace10210d9':
3 years ago
superman
52951bf1cf
Merge pull request #8246 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'af3fb172ab1d885a57d37ac03b56f436b9836fb0':
3 years ago
superman
af3fb172ab
Merge pull request #8243 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'b25442a5d89d5a19290ada696a4a1da7e5c33c7c':
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
REPORT-67954 远程设计时数据集面板数据连接空白的问题
CHART-22972 HyperlinkProvider接口对图表超链不起作用
CHART-22972 HyperlinkProvider接口对图表超链不起作用
REPORT-67119 在线组件库Tab面板重复显示
KERNEL-9928 重构水印 1.水印接口规范
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
DEC-22333 设计器使用一段时间后卡死
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
3 years ago
superman
b25442a5d8
Merge pull request #8240 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '8f780e4809e173265a5679c8f6ecd66db420dc15':
DEC-22333 设计器使用一段时间后卡死
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
superman
5052734c4b
Merge pull request #8235 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '334320ae80c82813b29033a65c1ace688f883e63':
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
REPORT-67954 远程设计时数据集面板数据连接空白的问题
3 years ago
superman
334320ae80
Merge pull request #8233 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '8f780e4809e173265a5679c8f6ecd66db420dc15':
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
REPORT-67954 远程设计时数据集面板数据连接空白的问题
3 years ago
superman
8f780e4809
Merge pull request #8232 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2d860c98b721e8ea5f9e2efb8984da3a9f9b3621':
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
REPORT-67954 远程设计时数据集面板数据连接空白的问题
3 years ago
vito
2d860c98b7
Pull request #8227 : REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '85e00d7e126ba78fa9733fbe41efbeb8b29dae94':
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
3 years ago
rinoux
c792ed3843
Pull request #8226 : REPORT-67954 远程设计时数据集面板数据连接空白的问题
...
Merge in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
* commit 'babc63fff44287edb174722ccced4ecfc2e61371':
REPORT-67954 远程设计时数据集面板数据连接空白的问题
3 years ago
vito
85e00d7e12
REPORT-66767 存储过程数据集报错提示窗口没有内容的问题
3 years ago
rinoux
babc63fff4
REPORT-67954 远程设计时数据集面板数据连接空白的问题
3 years ago
superman
7a5b93857d
Merge pull request #8220 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '16a418622c48436f65fab357f6a079d67d19a5f9':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
16a418622c
Merge pull request #8218 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'e3f9303afb2a3499616e4def35bddce2bf1dbfb9':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
e3f9303afb
Merge pull request #8217 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'da9c94cf5dcfc08c05d0ced29932a215868fa566':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
da9c94cf5d
Pull request #8213 : CHART-22972 HyperlinkProvider接口对图表超链不起作用
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '6cf461450ef13a20d0233e3194b1ac4f12a4dbbe':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
6cf461450e
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
pengda
b60b8a78f0
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
3e63d22c64
Merge pull request #8192 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'c21e86584912b0041c59034011c258f0cb67aedb':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
c21e865849
Merge pull request #8190 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '75343847c1026c7ea491be027860bfed05b2cd87':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
75343847c1
Merge pull request #8189 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd66b911e3cde4768cdbe67a03f8e973804bab134':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
d66b911e3c
Pull request #8181 : CHART-22972 HyperlinkProvider接口对图表超链不起作用
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '82098262df1974400f4b9b093eda65cd3121566d':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
82098262df
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
superman
1b55ca9023
Merge pull request #8166 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'a4afa2f7c959b998bbe83bb487e0d5a3f3f2ea95':
REPORT-67119 在线组件库Tab面板重复显示
3 years ago
superman
a4afa2f7c9
Merge pull request #8164 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2e5544c7c7e953f75ba6b9d65bbcee4417b44538':
REPORT-67119 在线组件库Tab面板重复显示
3 years ago
superman
2e5544c7c7
Merge pull request #8163 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6a8df7c239a3b5acc2196e7af7ea080bb46d30e0':
REPORT-67119 在线组件库Tab面板重复显示
3 years ago
starryi
6a8df7c239
Pull request #8149 : REPORT-67119 在线组件库Tab面板重复显示
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit 'a0ab6a8b403fd20ed5d60fc56e6299b6b5a15ffc':
REPORT-67119 在线组件库Tab面板重复显示
3 years ago
Starryi
a0ab6a8b40
REPORT-67119 在线组件库Tab面板重复显示
...
【问题原因】
代码合并问题,导致重复添加在线组件库面板
【改动思路】
删除多余的添加逻辑
3 years ago
superman
783cf7b15a
Merge pull request #8096 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '90da6f8ca74bfe53a1a0bd1bef65a4f567401d2d':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
superman
90da6f8ca7
Merge pull request #8094 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '290f24451079ab782153c15edfad6131672e312d':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
superman
290f244510
Merge pull request #8093 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f449a5d6031326608c5bf1cecfefd5d551974e85':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
superman
f449a5d603
Merge pull request #8092 in DESIGN/design from final/10.0 to release/10.0
...
* commit '44b4aa2f50faf3f0c9a422451bd6cc8bc8d2444c':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
superman
44b4aa2f50
Merge pull request #8091 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'a6befdf04876f095eacbe80cde28d7b7061a754f':
3 years ago
superman
a6befdf048
Merge pull request #8083 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'cb773494f4cd67e213fcb135304d5ee18d9ec1be':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
Hoky.He
cb773494f4
Pull request #8082 : REPORT-67359 模板-水印-点击无反应
...
Merge in DESIGN/design from ~HOKY.HE/design:final/10.0 to final/10.0
* commit 'c6ff1fe5c491d5818b9b083038cdd312a29c2da0':
REPORT-67359 模板-水印-点击无反应 1.水印接口规范
3 years ago
Hoky
c6ff1fe5c4
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
3 years ago
Hoky
129152ce22
REPORT-67359 模板-水印-点击无反应
...
1.水印接口规范
3 years ago
superman
017603ab2d
Merge pull request #8007 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1d5cbca20f560bb02d3c66d29140fc961bce82d8':
KERNEL-9928 重构水印 1.水印接口规范
无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
3 years ago
superman
1d5cbca20f
Merge pull request #8005 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'c04f36c71c6222df935b3ef227c238aebd398337':
KERNEL-9928 重构水印 1.水印接口规范
无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
3 years ago
superman
c04f36c71c
Merge pull request #8004 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd512d7b014b1051ec359df14997d2f02db7ce190':
KERNEL-9928 重构水印 1.水印接口规范
无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
3 years ago
Hoky.He
d512d7b014
Pull request #8001 : KERNEL-9928 重构水印
...
Merge in DESIGN/design from ~HOKY.HE/design:release/10.0 to release/10.0
* commit 'b7e5268ee19a3bb8d67812d4cc8d5e935096b9ed':
KERNEL-9928 重构水印 1.水印接口规范
无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
3 years ago
Hoky
b7e5268ee1
KERNEL-9928 重构水印
...
1.水印接口规范
3 years ago
Hoky
e11c472dc2
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
lucian
0b42a1d989
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0
3 years ago
superman
69e9212c52
Merge pull request #7966 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'dc59209cce0f34ab543f14762dc271b5edccbbc1':
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago
superman
dc59209cce
Merge pull request #7964 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '17e3bf2892ed308aa2039ad30c03cf0f24f5651d':
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago
superman
17e3bf2892
Merge pull request #7963 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ba2a4e93ef406d1e44d050d8194a71ba04c3e5c2':
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago
superman
ba2a4e93ef
Merge pull request #7962 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'c850ab45864e0b16b4a44f1308e6448524143c36':
3 years ago
superman
c850ab4586
Merge pull request #7961 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '908a7432e3247c9f18f10213682524fb59fd70bc':
3 years ago
fanglei
c2abe66ee3
Pull request #7955 : REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'c68113bf9d885fb747b8ed87d59e6863bb978432':
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago