Starryi
a0ab6a8b40
REPORT-67119 在线组件库Tab面板重复显示
...
【问题原因】
代码合并问题,导致重复添加在线组件库面板
【改动思路】
删除多余的添加逻辑
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
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
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
superman
908a7432e3
Merge pull request #7956 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '016ce05919a9d4984f2d13445497237c4e88d043':
3 years ago
方磊
c68113bf9d
Merge branch 'final/10.0' into release/10.0
...
* final/10.0:
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago
方磊
b4f8abd4fc
REPORT-60538 英日韩环境未屏蔽在线组件库 11.0 -> 10.0
3 years ago
superman
91d56cb630
Merge pull request #7946 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'a217dda374faed7702a0e1d442d05193fda951f5':
3 years ago
superman
a217dda374
Merge pull request #7945 in DESIGN/design from final/10.0 to release/10.0
...
* commit '016ce05919a9d4984f2d13445497237c4e88d043':
3 years ago
superman
016ce05919
Merge pull request #7944 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '6f5cb229a5288dd03364ef3478360be29f4f371b':
3 years ago
superman
6f5cb229a5
Merge pull request #7942 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '7dac1847763f23a7f86e3bda1ca64def142354a8':
3 years ago
Hoky
cd42fe3349
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
superman
88f6ab6a0d
Merge pull request #7923 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'acf7cb5de2e0061e1f6ac74f1c9b6b8d0921a1a2':
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
superman
acf7cb5de2
Merge pull request #7922 in DESIGN/design from final/10.0 to release/10.0
...
* commit '7dac1847763f23a7f86e3bda1ca64def142354a8':
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
superman
7dac184776
Merge pull request #7921 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd96182d015d53540385e9ebfe0f832e810df97bc':
3 years ago
Hades
a99685a3a1
Pull request #7915 : DEC-22333 设计器使用一段时间后卡死
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '16bf1aea01d8e4ff9aa75726c89128c5a19afa3a':
DEC-22333 设计器使用一段时间后卡死
3 years ago
superman
d96182d015
Merge pull request #7918 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '941089d0ee000a1c819fb9986dbead1c2b44d356':
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
REPORT-63660 修正不合理的国际化命名
REPORT-65920
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.所有面板读取水印都从global读取
REPORT-65920 【11.0】mac电脑设计器全屏,tab-移动端-样式模板,下拉框偶发性的会出现在下面一个层级
REPORT-66011 设计器显示的文字错了
REPORT-65950 fix 改成toFront
REPORT-63660 frm新旧自适应切换-国际化问题
REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
REPORT-58799 模版缺失插件提示无法关闭
3 years ago
fanglei
941089d0ee
Pull request #7917 : REPORT-66167 解决图表栏有时候无法显示某些图表的问题
...
Merge in DESIGN/design from ~FANGLEI/design:final/10.0 to final/10.0
* commit '944232b92c7982519b1c51a6889876b4e3837249':
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
方磊
944232b92c
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
hades
16bf1aea01
DEC-22333 设计器使用一段时间后卡死
3 years ago
Hoky
cdab3bde0f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
superman
f42673bdf4
Merge pull request #7863 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '3e2994c9adb937c8bb8798d1bfc7168bffd7b0bc':
3 years ago
superman
3e2994c9ad
Merge pull request #7862 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3ea5b75a00dc83f165ae4efef3b72d6778cfc2ac':
3 years ago
fanglei
a5cd953651
Pull request #7854 : REPORT-66167 解决图表栏有时候无法显示某些图表的问题
...
Merge in DESIGN/design from ~FANGLEI/design:bugfix/10.0 to bugfix/10.0
* commit '2bf1b599c251438c912dd91d8917a952c8ea15c5':
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
superman
3ea5b75a00
Merge pull request #7859 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'fffe9ece5b8f993bb01f5c21784dbf4ac230b260':
REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
REPORT-63660 修正不合理的国际化命名
REPORT-65920
REPORT-65920 【11.0】mac电脑设计器全屏,tab-移动端-样式模板,下拉框偶发性的会出现在下面一个层级
REPORT-66011 设计器显示的文字错了
REPORT-65950 fix 改成toFront
REPORT-63660 frm新旧自适应切换-国际化问题
REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
REPORT-58799 模版缺失插件提示无法关闭
3 years ago
superman
fffe9ece5b
Merge pull request #7858 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '61007dce855ad36ce5b939ec0fe24bb3de2615a6':
REPORT-65950 fix 改成toFront
REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
3 years ago
方磊
2bf1b599c2
REPORT-66167 解决图表栏有时候无法显示某些图表的问题
3 years ago
superman
61007dce85
Merge pull request #7847 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e63507e24f7ff629a32fa90588c558de1bcf14e8':
REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
3 years ago
starryi
e63507e24f
Pull request #7844 : REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit '8eed95f4eafb72d4a79d806ba3446f97e7113287':
REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
3 years ago
Starryi
8eed95f4ea
REPORT-66342 组件复用-设计器里在线组件页面一直显示加载中,日志没有报错;帆软市场web页面效果正常
...
【问题原因】
Comparator中比较double时使用了允许误差的比较方法,产生异常
【改动思路】
使用Double.compare方法比较double值
3 years ago
Hoky
c28db2993d
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
...
# Conflicts:
# designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
3 years ago
superman
7f80a14a84
Merge pull request #7828 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f8461e615586c0a7e0466cf072c265539355d038':
REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
3 years ago
fanglei
f8461e6155
Pull request #7726 : REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'ba9f7f759dba495e33fed5a9b24a93dd92948a23':
REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
3 years ago
superman
bddff1bdb4
Merge pull request #7729 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7c7e7a0ec55833058dcc2fba79d636f8220bf6d6':
REPORT-63660 修正不合理的国际化命名
REPORT-65920
REPORT-65920 【11.0】mac电脑设计器全屏,tab-移动端-样式模板,下拉框偶发性的会出现在下面一个层级
REPORT-66011 设计器显示的文字错了
REPORT-63660 frm新旧自适应切换-国际化问题
3 years ago
方磊
ba9f7f759d
REPORT-66174 组件复用-tab块组件创建的复用组件,原始尺寸没超过500*300,但是复用组件的尺寸和原始尺寸不一致了
3 years ago
fanglei
7c7e7a0ec5
Pull request #7666 : REPORT-63660 frm新旧自适应切换-国际化问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '1226303d70ed029d9695c7bff82dba52fb8d13ec':
REPORT-63660 修正不合理的国际化命名
REPORT-65920
REPORT-65920 【11.0】mac电脑设计器全屏,tab-移动端-样式模板,下拉框偶发性的会出现在下面一个层级
REPORT-66011 设计器显示的文字错了
REPORT-63660 frm新旧自适应切换-国际化问题
3 years ago
方磊
1226303d70
REPORT-63660 修正不合理的国际化命名
3 years ago