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
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
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
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
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
Hoky
cdab3bde0f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
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
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
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
方磊
fc3bc83064
REPORT-65920
3 years ago
Hades
17fd97ab29
Pull request #7654 : REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '6faea50c92f15da2259b54507cf545e9cee58f70':
REPORT-65950 fix 改成toFront
REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
3 years ago
superman
b0dfcfbe5e
Merge pull request #7693 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c0b1e5f5af99aebca40da48fd442d1a83654dfb7':
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.所有面板读取水印都从global读取
3 years ago
superman
c0b1e5f5af
Merge pull request #7692 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f1b6fd244efbeca94f1d632852cc60f16458c100':
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.所有面板读取水印都从global读取
3 years ago
Hoky.He
f1b6fd244e
Pull request #7689 : REPORT-65724 安全性-水印-水印公式不解析
...
Merge in DESIGN/design from ~HOKY.HE/design-hoky:final/10.0 to final/10.0
* commit '5c2f92dc0b9bd77de902c53c7f5f7e0e73c122f9':
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.所有面板读取水印都从global读取
3 years ago
Hoky
5c2f92dc0b
REPORT-65724 安全性-水印-水印公式不解析
...
1.从全局读取水印
3 years ago
Hoky
7090b8f358
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
3 years ago
Hoky
a3d1f2eaa2
REPORT-65724 安全性-水印-水印公式不解析
...
1.所有面板读取水印都从global读取
3 years ago
Hoky
44bc4e93b7
无jira 新建水印npe
...
1.新建决策模板时改成从全局读取水印
3 years ago
方磊
b86d00b5ca
REPORT-65920 【11.0】mac电脑设计器全屏,tab-移动端-样式模板,下拉框偶发性的会出现在下面一个层级
3 years ago
方磊
c7f6d6a791
REPORT-66011 设计器显示的文字错了
3 years ago
hades
6faea50c92
REPORT-65950 fix 改成toFront
3 years ago
方磊
cfa4526090
REPORT-63660 frm新旧自适应切换-国际化问题
3 years ago
hades
4f5e0d03af
REPORT-65950 10.0设计器打开11.0模板时,全局样式丢失和大版本不匹配的弹窗顺序不对
3 years ago
superman
c53dc882d8
Merge pull request #7640 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c61b95c769811f87f0671403f0a0dd25299d8ee6':
3 years ago
superman
c61b95c769
Merge pull request #7639 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3944c3b4d8dd0e7970cfb7b6cb0b84c4aa95ee11':
3 years ago
superman
3944c3b4d8
Merge pull request #7638 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'dbb78d3b9d17e14b5afd0007a5ee3576e53a9573':
3 years ago
superman
dbb78d3b9d
Merge pull request #7635 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'b308dbf271de8f33e1c44ea11d6566a3ca2c64e1':
REPORT-65513 填报-填报属性设置-设置单元格组,提示“单元格个数必须相同”的交互逻辑问题
3 years ago