design

Commit Graph

Author	SHA1	Message	Date
WeiYanglu	c777d0889a	CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine	3 years ago
WeiYanglu	541fd4f288	Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine" This reverts commit `ea109b45f6`.	3 years ago
WeiYanglu	ea109b45f6	CHART-23172 & CHART-23111 只处理没正确关闭engine	3 years ago
WeiYanglu	c7b284ad9e	Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine" This reverts commit `b069132341`.	3 years ago
WeiYanglu	b069132341	CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine	3 years ago
zheng	f06122ef98	Pull request #8277 : CHART-23245 fix:模板锁定备份fvs Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0 * commit '9c0cb177485276df667c5c8b70d62128e4c7d367': CHART-23245 fix:模板锁定备份fvs	3 years ago
pengda	b40293de14	Pull request #8267 : CHART-22994 图表背景色控件需要更换为支持透明色的控件 Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0 * commit '47caddcba06f1c88965c87eaec66d5a4a45fa6e6': CHART-22994 图表背景色控件需要更换为支持透明色的控件	3 years ago
shine	9c0cb17748	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0	3 years ago
shine	9ad9cf5de1	CHART-23245 fix:模板锁定备份fvs	3 years ago
pengda	47caddcba0	CHART-22994 图表背景色控件需要更换为支持透明色的控件	3 years ago
superman	e3fc6e6ed3	Merge pull request #8263 in DESIGN/design from final/11.0 to release/11.0 * commit '47961506b87e3b293135d8863281be167541238f': REPORT-68059 js编辑器，自定义按钮触发的弹窗层级不对	3 years ago
pengda	47961506b8	Pull request #8242 : REPORT-68059 js编辑器，自定义按钮触发的弹窗层级不对 Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0 * commit '39b29d40664f9bd7041073c5c3c6cdb54ff10ba2': REPORT-68059 js编辑器，自定义按钮触发的弹窗层级不对	3 years ago
superman	e1168fd8c5	Merge pull request #8252 in DESIGN/design from final/11.0 to release/11.0 * commit '59681036062f3e533c9c070c976b935a10c4f8fe':	3 years ago
superman	5968103606	Merge pull request #8244 in DESIGN/design from release/11.0 to final/11.0 * commit '51558d540d72d6673c1f3149cc9d61d722d31efc': REPORT-67833 富文本-颜色设置：选择主题色后最近使用的颜色处不会更新，需要多次点击 REPORT-67954 远程设计时数据集面板数据连接空白的问题提交11 REPORT-67329 填报-web端预览-10升级11，透明的纸张背景变成了白色无JIRA项目对Install4j方法的调用全部改用反射实现，避免出现引用异常 REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错 REPORT-65140 报表块图表块在设计器上改变大小的时候，保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸 REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时，老预览下看不到该控件，新预览下可以看到 1、在修改布局的时候，同时修改参数面板的width REPORT-67092 交互视觉修改 REPORT-66690 tab块名称不允许重复	3 years ago
pengda	39b29d4066	REPORT-68059 js编辑器，自定义按钮触发的弹窗层级不对	3 years ago
Hades	51558d540d	Pull request #8239 : REPORT-67833 富文本-颜色设置：选择主题色后最近使用的颜色处不会更新，需要多次点击 Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0 * commit 'cad840da238e03d6dc86df14077dcd62d65b4cf7': REPORT-67833 富文本-颜色设置：选择主题色后最近使用的颜色处不会更新，需要多次点击	3 years ago
hades	cad840da23	REPORT-67833 富文本-颜色设置：选择主题色后最近使用的颜色处不会更新，需要多次点击	3 years ago
rinoux	bf975f7f19	Pull request #8229 : REPORT-67954 远程设计时数据集面板数据连接空白的问题提交11 Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0 * commit 'b26a85d3f668ffe41d402d7089420744ec45acd9': REPORT-67954 远程设计时数据集面板数据连接空白的问题提交11	3 years ago
rinoux	b26a85d3f6	REPORT-67954 远程设计时数据集面板数据连接空白的问题提交11	3 years ago
superman	74e765624b	Merge pull request #8194 in DESIGN/design from final/11.0 to release/11.0 * commit 'd96cebca32ac38dae6847fd85d9b289bdb954a6b':	3 years ago
superman	d96cebca32	Merge pull request #8193 in DESIGN/design from persist/11.0 to final/11.0 * commit '53a0554b757e46ef11e708e9b53241818396e43a':	3 years ago
kerry	df8e916189	Pull request #8184 : REPORT-67329 填报-web端预览-10升级11，透明的纸张背景变成了白色 Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '6394044df6f4f02d3cd61bbecb523de468acbe0a': REPORT-67329 填报-web端预览-10升级11，透明的纸张背景变成了白色	3 years ago
kerry	6394044df6	REPORT-67329 填报-web端预览-10升级11，透明的纸张背景变成了白色	3 years ago
superman	53a0554b75	Merge pull request #8183 in DESIGN/design from final/11.0 to persist/11.0 * commit '181bbc74b774fca0025f29f71920fc45df4fdd56':	3 years ago
starryi	70bf342d9e	Pull request #8160 : REPORT-67689 对Install4j方法的调用全部改用反射实现，避免出现引用异常 Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'fd1e35aaa194d8f471ec66e2295c5e66f59b6afd': 无JIRA项目对Install4j方法的调用全部改用反射实现，避免出现引用异常	3 years ago
Starryi	fd1e35aaa1	无JIRA项目对Install4j方法的调用全部改用反射实现，避免出现引用异常【问题原因】考核同学使用starter项目，无法进行正常编译，出现类和方法调用异常。一方面是starter项目没有配置对intall4j的编译依赖导致，另一方面是主jar中对install4j API的使用没有反射导致【改动思路】改用反射方式调用Install4J相关API 【review建议】	3 years ago
Yuan.Wang	9c2f469c35	Pull request #8109 : REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错 Merge in DESIGN/design from ~YUAN.WANG/design:release/11.0 to release/11.0 * commit 'aa34194900409a2a803958dfa18ce14464ca137d': REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错	3 years ago
Yuan.Wang	aa34194900	REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错	3 years ago
kerry	10d4e9eb0a	Pull request #8090 : REPORT-65140 报表块图表块在设计器上改变大小的时候，保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸 Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit 'b37653b5e70f43ed23b3e4d33f800f1d083e11fc': REPORT-65140 报表块图表块在设计器上改变大小的时候，保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸	3 years ago
superman	607cb44ec9	Merge pull request #8098 in DESIGN/design from final/11.0 to release/11.0 * commit '181bbc74b774fca0025f29f71920fc45df4fdd56': CHART-23035 仪表盘轴标签样式修改均不生效 CHART-23035 仪表盘轴标签样式修改均不生效	3 years ago
superman	181bbc74b7	Merge pull request #8097 in DESIGN/design from persist/11.0 to final/11.0 * commit 'd14435e09c7fe09907f0755bd890e5c41de20e6c':	3 years ago
kerry	b37653b5e7	REPORT-65140 报表块图表块在设计器上改变大小的时候，保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸	3 years ago
superman	d14435e09c	Merge pull request #8087 in DESIGN/design from final/11.0 to persist/11.0 * commit 'c6317d30811868472d164f361dba8abbfb982870': CHART-23035 仪表盘轴标签样式修改均不生效 CHART-23035 仪表盘轴标签样式修改均不生效 KERNEL-9928 重构水印 1.水印接口规范 REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印 REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读	3 years ago
fanglei	c6317d3081	Pull request #8086 : CHART-23035 仪表盘轴标签样式修改均不生效 Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0 * commit '3418096cef65b89120db69798efa72765e83bac0': CHART-23035 仪表盘轴标签样式修改均不生效	3 years ago
方磊	3418096cef	CHART-23035 仪表盘轴标签样式修改均不生效	3 years ago
fanglei	279ae14610	Pull request #8085 : CHART-23035 仪表盘轴标签样式修改均不生效 Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0 * commit '1911ebba5145bfff6ad86d95152f7473a2dde50d': CHART-23035 仪表盘轴标签样式修改均不生效	3 years ago
方磊	1911ebba51	CHART-23035 仪表盘轴标签样式修改均不生效	3 years ago
Link.Zhao	09cf4accc2	Pull request #8070 : REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时，老预览下看不到该控件，新预览下可以看到 Merge in DESIGN/design from ~LINK.ZHAO/design:release/11.0 to release/11.0 * commit 'baf60127e9443e7a2a0d6d7c9cb7fff06c8b8969': REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时，老预览下看不到该控件，新预览下可以看到 1、在修改布局的时候，同时修改参数面板的width	3 years ago
superman	a3d6a810ed	Merge pull request #8080 in DESIGN/design from final/11.0 to release/11.0 * commit '1b5822849500ad2fc2524436fd78e42bf77b4ef8': KERNEL-9928 重构水印 1.水印接口规范 REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印 REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读	3 years ago
Hoky.He	1b58228495	Pull request #8072 : KERNEL-9928 重构水印 Merge in DESIGN/design from ~HOKY.HE/design:final/11.0 to final/11.0 * commit '81b629180fd419731094677aa85c312337474f14': KERNEL-9928 重构水印 1.水印接口规范 REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印 REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读	3 years ago
Hoky	81b629180f	Merge remote-tracking branch 'origin/final/11.0' into final/11.0 # Conflicts: # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java	3 years ago
Hoky	6118879924	KERNEL-9928 重构水印 1.水印接口规范	3 years ago
Link.Zhao	baf60127e9	REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时，老预览下看不到该控件，新预览下可以看到 1、在修改布局的时候，同时修改参数面板的width	3 years ago
superman	94269f38a5	Merge pull request #8041 in DESIGN/design from final/11.0 to release/11.0 * commit '2368b5ff1a2e94b1adeadcb53a8cfb6373596076':	3 years ago
superman	2368b5ff1a	Merge pull request #8040 in DESIGN/design from persist/11.0 to final/11.0 * commit 'abd881651a53b42b253f6ea4d2684557ff068e75':	3 years ago
superman	abd881651a	Merge pull request #8033 in DESIGN/design from final/11.0 to persist/11.0 * commit 'c500730beea9f35d83dedee4c10410ca38738e1e':	3 years ago
superman	a24c86b434	Merge pull request #8021 in DESIGN/design from final/11.0 to release/11.0 * commit 'c500730beea9f35d83dedee4c10410ca38738e1e': REPORT-67095【新老自适应配置面板修改】老模式-PC端自适应属性选跟随服务器，服务器报表块选“默认”，此时设计画布里的报表块右侧设置面板即提示了“已选择默认自适应方式”，又有Pc浏览器自适应设置项，且web预览的效果看起来是符合Pc浏览器自适应设置的	3 years ago
superman	c500730bee	Merge pull request #8020 in DESIGN/design from persist/11.0 to final/11.0 * commit 'ee9257d20cf34ef09f30ff1bed02ac023eaa3aed':	3 years ago
kerry	a989ddffff	Pull request #7999 : REPORT-66690 tab块名称不允许重复 Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit 'ebeedc191f1c3eee268191b559d072333d446a68': REPORT-67092 交互视觉修改 REPORT-66690 tab块名称不允许重复	3 years ago
superman	ee9257d20c	Merge pull request #8013 in DESIGN/design from final/11.0 to persist/11.0 * commit '0bc484e89ff49bd678dd21f1ad353a842d5cb12b': (114 commits) REPORT-67095【新老自适应配置面板修改】老模式-PC端自适应属性选跟随服务器，服务器报表块选“默认”，此时设计画布里的报表块右侧设置面板即提示了“已选择默认自适应方式”，又有Pc浏览器自适应设置项，且web预览的效果看起来是符合Pc浏览器自适应设置的 REPORT-66939 REPORT-66947 REPORT-66947 拖拽拖出可拖拽区域的时候，没有及时清理内存里残留的上次dropTarget对象，需要清理一下 REPORT-58833 js编辑器埋点 REPORT-66966 FR11决策报表-放在推荐布局占位块里的报表块组件，拖拽调整尺寸，保存模板再打开模板，再拖拽调整报表块组件尺寸，会出现和空白块重叠错乱的现象 CHART-22936 图表切换控件标题设置公式无效 REPORT-66274【公式报错优化】windows下从日志定位会再打开一次模板 REPORT-66306 组件包下载面板无遮罩阴影 REPORT-66947 REPORT-66827&REPORT-66947&REPORT-66946 REPORT-66886 鼠标悬浮n秒后释放，没有将组件放入tab中 REPORT-66254 【组件商城风格优化】打开商城窗口到商城内容显示出来，期间大概有5秒空白状态，需要优化下 REPORT-66930 【组件商城风格优化】网慢时多次点击下载出现多个弹窗 REPORT-66884 REPORT-66884 修正拖拽组件时候备份组件的时机 REPORT-66254 【组件商城风格优化】打开商城窗口到商城内容显示出来，期间大概有5秒空白状态，需要优化下代码修改 REPORT-66808 && REPORT-66811 【新老自适应配置面板修改】老模式-PC端自适应属性的“报表”选择默认时，报表块右侧设置面板预期是有个“已选择默认balabala”提示文字的，现在么有；【新老自适应配置面板修改】老模式-交互文档里设计的绝对布局下，“报表缩放设置”可选“双向自适应”“不自适应”，现在的效果是“固定大小”“适应区域” REPORT-66807 Mini商城窗口启动来源埋点 ...	3 years ago

1 2 3 4 5 ...

17370 Commits (0d6d3cd98d8b99d665c793eb73c83bb2f579b51c) All Branches Search

17370 Commits (0d6d3cd98d8b99d665c793eb73c83bb2f579b51c)

All Branches