Tree: 6d9b77c809

10.0

bugfix/10.0

bugfix/11.0

feature/10.0

feature/big-screen

feature/x

final/10.0

final/11.0

master

persist/10.0

persist/11.0

release/10.0

release/11.0

research/10.0

research/11.0

zheng-1641779399395

10.0.10.2020.10.20

10.0.11.2020.11.25

10.0.12.2020.12.17

10.0.13.2021.01.19

10.0.14.2021.03.02

10.0.15.2021.04.02

10.0.15.2021.04.20

10.0.15.2021.05.07

10.0.16.2021.05.19

10.0.16.2021.06.10

10.0.17.2021.06.24

10.0.17.2021.07.12

10.0.18

10.0.18.2021.07.26

10.0.18.2021.07.30

10.0.18.2021.08.13

10.0.18.2021.08.19

10.0.18.2021.08.25

10.0.19.10.2022.4.3

10.0.19.2021.01.13

10.0.19.2021.08.30

10.0.19.2021.09.02

10.0.19.2021.09.07

10.0.19.2021.09.18

10.0.19.2021.10.12

10.0.19.2021.10.13

10.0.19.2021.10.27

10.0.19.2021.11.11

10.0.19.2021.11.25

10.0.19.2021.12.03

10.0.19.2021.12.13

10.0.19.2021.12.28

10.0.19.2022.01.18

10.0.19.2022.02.14

10.0.19.2022.02.16

10.0.19.2022.03.01

10.0.19.2022.03.18

10.0.19.2022.03.25

10.0.19.2022.04.15

10.0.19.2022.04.18

10.0.19.2022.04.20

10.0.19.2022.04.21

10.0.19.2022.04.27

10.0.19.2022.04.29

10.0.19.2022.05.06

10.0.19.2022.05.07

10.0.19.2022.05.20

10.0.19.2022.06.10

10.0.19.2022.07.01

10.0.19.2022.07.05

10.0.19.2022.07.16

10.0.19.2022.08.03

10.0.19.2022.08.22

10.0.19.2022.08.23

10.0.19.2022.08.26

10.0.19.2022.09.07

10.0.19.2022.09.23

10.0.19.2022.09.27

10.0.19.2022.10.21

10.0.19.2022.11.10

10.0.19.2022.11.11

10.0.19.2022.11.17

10.0.7.2020.06.25

10.0.8.2020.07.16

10.0.8.2020.07.23

10.0.9.2020.08.20

10.0.9.2020.09.27

20170315

20170420

20170516

20170605

20170619

20170705

20170718

20170807

FR10.0.6

bugfix-210728

bugfix-210728-2

stable20180202_115424

stable20180202_141700

stable20180202_145821

stable20180202_150532

stable20180206_090434

stable20180206_184315

stable20180207_155703

stable20180207_162245

stable20180208_094747

stable20180208_135622

stable20180208_141532

stable20180208_152958

stable20180208_164904

stable20180208_174644

stable20180209_032849

stable20180209_151737

stable20180210_032935

stable20180211_033136

stable20180212_033412

stable20180213_033154

stable20180214_033059

stable20180215_033025

stable20180216_033037

stable20180223_033635

stable20180224_033419

stable20180225_033053

stable20180226_033202

stable20180226_155101

stable20180227_033503

stable20180228_033324

stable20180228_164937

stable20180301_032727

stable20180301_124213

stable20180306_190751

stable20180313_164145

stable20180314_104125

stable20180314_133605

stable20180314_145021

stable20180314_151106

stable20180314_200407

stable20180315_092409

stable20180315_155607

stable20180316_105610

stable20180316_134244

stable20180316_152905

stable20180316_163041

stable20180316_172746

stable20180319_113940

stable20180323_142938

stable20180329_164149

stable20180329_180317

stable20180402_153937

stable20180403_115124

stable20180403_173005

stable20180403_180140

stable20180404_100315

stable20180404_165442

stable20180408_095809

stable20180409_162235

stable20180410_143033

stable20180410_164546

stable20180410_171116

stable20180410_171523

stable20180411_150019

stable20180411_154530

stable20180411_162301

stable20180412_111613

stable20180413_142810

stable20180416_145225

stable20180416_182848

stable20180416_183048

stable20180417_102857

stable20180418_170918

stable20180419_111827

stable20180419_114738

stable20180419_120658

stable20180419_150013

stable20180419_155633

stable20180420_093921

stable20180420_104208

stable20180423_130822

stable20180423_174820

stable20180423_194019

stable20180424_093428

stable20180424_105947

stable20180424_161600

stable20180427_133955

stable20180427_135412

stable20180427_152811

stable20180427_172318

stable20180427_173759

stable20180427_183411

stable20180502_152355

stable20180502_180039

stable20180503_115327

stable20180503_140224

stable20180503_170620

stable20180503_173516

stable20180503_175451

stable20180507_151636

stable20180510_094318

stable20180510_175433

stable20180511_150457

stable20180515_143324

stable20180515_171649

stable20180515_204358

stable20180516_170759

stable20180516_175420

stable20180517_102755

stable20180522_110019

stable20180523_101613

stable20180530_182754

stable20180530_193826

stable20180531_100001

stable20180531_103158

stable20180531_120815

stable20180531_170754

stable20180604_122312

stable20180604_164659

stable20180605_165742

stable20180606_135802

stable20180606_142448

stable20180611_155548

stable20180613_103750

stable20180614_170911

stable20180622_210326

stable20180628_091213

stable20180628_112008

stable20180628_150626

stable20180628_153756

stable20180629_175223

stable20180702_094036

stable20180702_171500

stable20180703_094150

stable20180703_101927

stable20180703_113515

stable20180703_122633

stable20180703_141756

stable20180704_162608

stable20180710_101442

stable20180727_215110

stable20180731_184948

stable20180731_233541

stable20180801_112147

stable20180802_091552

stable20180802_093156

stable20180802_105957

stable20180802_152136

stable20180807_112412

stable20180807_180309

stable20180807_181802

stable20180808_160038

stable20180831_161405

stable20180831_174504

stable20180905_094447

stable20180905_110512

stable20180905_135747

stable20180905_143638

stable20180905_204128

stable20180906_170439

stable20180907_091408

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '6d9b77c809'

${ noResults }

Commit Graph

17110 Commits (6d9b77c809257e58c164cfd9899d717a143f4af7)

 

All Branches   

Search

Author	SHA1	Message	Date
hades	e1778bc2cf	无jira 解决冲突	3 years ago
superman	a33324102c	Merge pull request #7410 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit 'd66f49d5a5df036f886295ddb5077e9f66c82139': REPORT-64009 设计器内对macOS12的处理	3 years ago
starryi	3d2326879b	Pull request #7407: REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 ... Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0 * commit '3e4250f00c3741eec0a5af46e6ff1c74fe15a969': REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到	3 years ago
Starryi	3e4250f00c	Merge branch 'release/11.0' into final/11.0	3 years ago
starryi	4cdd995285	Pull request #7405: REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit '5d9ec7b72898a9cbd891d2c3c634123276b1efa2': REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到	3 years ago
Hades	d66f49d5a5	Pull request #7403: REPORT-64009 设计器内对macOS12的处理 ... Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0 * commit '5cdbe2ac25a8274ef19062c92f6e012196ee27a9': REPORT-64009 设计器内对macOS12的处理	3 years ago
superman	65638d798f	Merge pull request #7406 in DESIGN/design from release/11.0 to final/11.0 ... * commit 'f32b0cc67d5c5fb06f18bc6866fa42da3ceccef4': (165 commits) REPORT-65192 公式合法性检测错误字符位置返回不正确 1.如果返回错误位置，则模糊处理 KERNEL-9928 重构水印加载 1.改成常量 KERNEL-9928 重构水印加载 1.适配一下面板 REPORT-65192 公式合法性检测错误字符位置返回不正确 1.处理一下极少出现的情况，默认返回0的位置吧。 REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 REPORT-65090:将builder的形式换成普通的创建focusPoint的方式 REPORT-65124 【模板主题】单元格样式编辑的效果有问题 问题修复 REPORT-65125 【模板主题】双击数据列设置格式，没有保存成功 REPORT-64920 复制粘贴接口报错处理 CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动 REPORT-65087 共享数据集兼容性问题 REPORT-65090：修复埋点格式错误bug REPORT-62611 远程设计websocket断开提示优化-toast弹窗在设计器界面居左后显示异常 REPORT-65072 【主题边框】单元格样式的预览小图中，内部边框线看着比较粗 REPORT-65060 【视觉验收】模板主题管理 REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件 REPORT-65050 远程模板锁定优化-fvs模板被超管在某设备上强制解锁后，编辑者点击保存时不会触发另存为弹窗，而是保存成功 REPORT-65059 设计器-给多个单元格设置边框，预览时只有一个 REPORT-65049 【主题边框】悬浮元素的跟随主题单元格样式显示，出现两种样式重叠的效果 ...	3 years ago
starryi	2f2d686dcc	Pull request #7389: KERNEL-9742 删除2020年迭代后未发布的旧主题功能代码 ... Merge in DESIGN/design from ~STARRYI/design:KERNEL-9742 to feature/x * commit '8bf4dd2f10d78deada3d4d96f5eea5ac0b0f8c90': KERNEL-9742 删除2020年迭代后未发布的旧主题功能代码	3 years ago
Starryi	5d9ec7b728	REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 ... 【问题原因】 补充下双重线的处理逻辑 【改动思路】 同上	3 years ago
kerry	597eed5d8a	REPORT-65107 决策报表-11frm，无法向tab组件上方拖入放置组件，10上操作还比较顺畅	3 years ago
Hoky.He	f32b0cc67d	Pull request #7402: KERNEL-9928 重构水印加载 && REPORT-65192 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0 * commit 'd062899bf7f024f870cf37eff66b5479d96cfb04': REPORT-65192 公式合法性检测错误字符位置返回不正确 1.如果返回错误位置，则模糊处理 KERNEL-9928 重构水印加载 1.改成常量	3 years ago
Hoky	d062899bf7	REPORT-65192 公式合法性检测错误字符位置返回不正确 ... 1.如果返回错误位置，则模糊处理	3 years ago
hades	5cdbe2ac25	REPORT-64009 设计器内对macOS12的处理	3 years ago
Hoky	7d96377ff9	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	d1fe8799fc	KERNEL-9928 重构水印加载 ... 1.改成常量	3 years ago
Hoky.He	3ca808d7bc	Pull request #7401: KERNEL-9928 重构水印加载 && REPORT-65085 【设计器】新建表单，body那边的水印设置直接是为该模板单独设置 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0 * commit 'a3e4b69c35e7abb5aae8b96e3d99573556912dd8': KERNEL-9928 重构水印加载 1.适配一下面板	3 years ago
Hoky	a3e4b69c35	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	618fc17fa4	KERNEL-9928 重构水印加载 ... 1.适配一下面板	3 years ago
superman	f238181222	Merge pull request #7400 in DESIGN/design from release/11.0 to feature/x ... * commit '238b59bf1a9df7fe98292196784641969ac3e9f5': REPORT-65192 公式合法性检测错误字符位置返回不正确 1.处理一下极少出现的情况，默认返回0的位置吧。 REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 REPORT-65090:将builder的形式换成普通的创建focusPoint的方式 REPORT-65124 【模板主题】单元格样式编辑的效果有问题 问题修复 REPORT-65125 【模板主题】双击数据列设置格式，没有保存成功 REPORT-64920 复制粘贴接口报错处理 CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动	3 years ago
superman	238b59bf1a	Merge pull request #7393 in DESIGN/design from release/10.0 to release/11.0 ... * commit '456887c7d7486ca54d373d2d23eedc025a85f2b2': REPORT-64920 复制粘贴接口报错处理	3 years ago
Hoky.He	9f6351375f	Pull request #7394: REPORT-65192 公式合法性检测错误字符位置返回不正确 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0 * commit '26178276162e59ed38fb455ee50df5fb132f5353': REPORT-65192 公式合法性检测错误字符位置返回不正确 1.处理一下极少出现的情况，默认返回0的位置吧。	3 years ago
Hoky	2617827616	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	7b0715e3b1	REPORT-65192 公式合法性检测错误字符位置返回不正确 ... 1.处理一下极少出现的情况，默认返回0的位置吧。	3 years ago
starryi	801d2a1fe1	Pull request #7388: REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit '906eddd5710e6ab6df32fecacd9a345b222346dc': REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到	3 years ago
superman	893a19e6ae	Merge pull request #7392 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '456887c7d7486ca54d373d2d23eedc025a85f2b2': REPORT-64920 复制粘贴接口报错处理	3 years ago
Starryi	906eddd571	REPORT-65170【主题边框】悬浮元素的预览图，右下的边框线看不到 ... 【问题原因】 换个方式实现主题单元格内边框样式的预览效果，之前使用setClip(null)的 问题较大，会将边框绘制到父组件的其他区域 【改动思路】 根据预览时Cell的位置计算边框的位置，使得边框可以在Cell区域内完整展示 出来，而不至于被裁剪	3 years ago
Starryi	8bf4dd2f10	KERNEL-9742 删除2020年迭代后未发布的旧主题功能代码 ... 【问题原因】 无 【改动思路】 同上	3 years ago
Fly.Li	13d2c6c2a7	Pull request #7387: REPORT-65090 ... Merge in DESIGN/design from ~FLY.LI/design:release/11.0 to release/11.0 * commit '4ca15c285c85a244e96f8c2b99aad350e20af6c0': REPORT-65090:将builder的形式换成普通的创建focusPoint的方式	3 years ago
fly.li	4ca15c285c	REPORT-65090:将builder的形式换成普通的创建focusPoint的方式	3 years ago
kerry	10d7e82d2c	Pull request #7385: REPORT-65175 FR11-新自适应-新建的默认新模式决策报表，预览方式没有开发者调试预览 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '3da3518baaa72d4ba0a64144e2884dab5de3bf63': 问题修复	3 years ago
starryi	8c439731e2	Pull request #7386: REPORT-65125 & REPORT-65124 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'e1beb6c99d37059e39feef82776141255958cb70': REPORT-65124 【模板主题】单元格样式编辑的效果有问题 REPORT-65125 【模板主题】双击数据列设置格式，没有保存成功	3 years ago
fanglei	f86ae15a58	Pull request #7376: CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动 ... Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit '9da19ba5f9ed592db4cbeb4ca877503e168ebd14': CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动	3 years ago
Starryi	e1beb6c99d	REPORT-65124 【模板主题】单元格样式编辑的效果有问题 ... 【问题原因】 虽然ListCellRenderer中去除了icon，但是JNamedList实现还使用了icon的宽度来绘制内容，导致 渲染出来的编辑框有问题 【改动思路】 重新实现一个图表宽度为0的JNamedList	3 years ago
kerry	3da3518baa	问题修复	3 years ago
Starryi	adbc055b29	REPORT-65125 【模板主题】双击数据列设置格式，没有保存成功 ... 【问题原因】 格式面板必须注册GlobalNameListener才能正常updateBean，所以需要使用 AbstractAttrNoScrollPane包装格式面板 【改动思路】 同上	3 years ago
Tommy	456887c7d7	Pull request #7377: REPORT-64920 复制粘贴接口报错处理 ... Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0 * commit 'b74c40c8b5192222ba47073f56386cf5d25e4b73': REPORT-64920 复制粘贴接口报错处理	3 years ago
superman	aa8cd525f6	Merge pull request #7384 in DESIGN/design from release/11.0 to feature/x ... * commit '0fbe86093e3fcf88b656928a8a54e830c32f890b': REPORT-65087 共享数据集兼容性问题 REPORT-65090：修复埋点格式错误bug REPORT-62611 远程设计websocket断开提示优化-toast弹窗在设计器界面居左后显示异常 REPORT-65072 【主题边框】单元格样式的预览小图中，内部边框线看着比较粗 REPORT-65060 【视觉验收】模板主题管理 REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件 REPORT-65050 远程模板锁定优化-fvs模板被超管在某设备上强制解锁后，编辑者点击保存时不会触发另存为弹窗，而是保存成功 REPORT-65059 设计器-给多个单元格设置边框，预览时只有一个 REPORT-65049 【主题边框】悬浮元素的跟随主题单元格样式显示，出现两种样式重叠的效果 REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件 REPORT-64811 保持设计器商城下载reu文件名中的版本信息 CHART-22503 标题、图例、轴标题、数据表等字符颜色控件-多余增加了自动	3 years ago
ju|剧浩宇	0fbe86093e	Pull request #7378: 解决冲突 ... Merge in DESIGN/design from ~STARRYI/design:merge2release/11.0 to release/11.0 * commit 'a64043f3814231c5281ffec4b1329bb318dc3fec': REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件	3 years ago
Henry.Wang	63640d4752	Pull request #7368: REPORT-62611 远程设计websocket断开提示优化-toast弹窗在设计器界面居左后显示异常 ... Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0 * commit '84b7e492dd7e441bf1e2721fa79941c672b390d3': REPORT-62611 远程设计websocket断开提示优化-toast弹窗在设计器界面居左后显示异常	3 years ago
Starryi	a64043f381	Merge remote-tracking branch 'remote/release/10.0' into merge2release/11.0 ... # Conflicts: # designer-form/src/main/java/com/fr/design/mainframe/share/util/DownloadUtils.java	3 years ago
starryi	102bf09779	Pull request #7353: REPORT-64811 & REPORT-64738 & REPORT-65049 & REPORT-65059 & REPORT-65060 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'ba0d7751751b22a01d7b78fe5ef855eb153e037c': REPORT-65072 【主题边框】单元格样式的预览小图中，内部边框线看着比较粗 REPORT-65060 【视觉验收】模板主题管理 REPORT-65059 设计器-给多个单元格设置边框，预览时只有一个 REPORT-65049 【主题边框】悬浮元素的跟随主题单元格样式显示，出现两种样式重叠的效果 REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件 REPORT-64811 保持设计器商城下载reu文件名中的版本信息	3 years ago
Tommy	b74c40c8b5	REPORT-64920 复制粘贴接口报错处理	3 years ago
方磊	9da19ba5f9	CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动	3 years ago
superman	5425a3356f	Merge pull request #7374 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '7ad44f848935a4c9deb5b36434891fc103dd1462': REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件	3 years ago
superman	7ad44f8489	Merge pull request #7373 in DESIGN/design from final/10.0 to release/10.0 ... * commit '0c24f5a06b6889ebc23797d5627687ba74af56a3': REPORT-64738 设计器在线组件库中可见组件应去重且仅显示兼容当前设计器的组件	3 years ago
superman	0c24f5a06b	Merge pull request #7372 in DESIGN/design from persist/10.0 to final/10.0 ... * commit 'a24f4fac4c7fac9b639b0a5bf8954b5181b31d28':	3 years ago
Fly.Li	7f1d06e65e	Pull request #7371: release/11.0 ... Merge in DESIGN/design from ~FLY.LI/design:release/11.0 to release/11.0 * commit 'a59d4194b5b23864437f1367ff633b9e9ac27b11': REPORT-65090：修复埋点格式错误bug	3 years ago
Fly.Li	4871ef6daf	Pull request #7369: feature/x ... Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x * commit '7c11a48610c4fcecb8cae93f7e040e97712d8e8c': REPORT-55241:修复埋点格式无法解析的问题	3 years ago
rinoux	57dd9d8e78	Pull request #7370: 共享数据集兼容性问题 ... Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0 * commit '4d71ca4418d2dc6a55108908f51665108a0fc088': REPORT-65087 共享数据集兼容性问题	3 years ago
rinoux	4d71ca4418	REPORT-65087 共享数据集兼容性问题	3 years ago