design

Commit Graph

Author	SHA1	Message	Date
hades	0da1ac1ad0	无jira 解决冲突	3 years ago
superman	e20b93f7b5	Merge pull request #7107 in DESIGN/design from final/10.0 to release/10.0 * commit 'b56616d07893e15ae0cd8b0d47d6c41af7bff6fd': CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px REPORT-64095 websocket频繁出现断开又连上问题	3 years ago
Yvan	0155250ccc	Pull request #7100 : KERNEL-9860 插件修改xml中active标签逻辑重构 Merge in DESIGN/design from ~YVAN/design:release/11.0 to release/11.0 * commit 'b6d38f7f2eab0689ddcca04ad722bfc40841574c': KERNEL-9860 插件修改xml中active标签逻辑重构跟vito讨论了下，决定模板报错的一键处理这儿，也是需要修改xml的，因为也是用户自己点的处理 KERNEL-9860 插件修改xml中active标签逻辑重构【问题原因】rt 【改动思路】详见https://kms.fineres.com/pages/viewpage.action?pageId=289590798 【review建议】	3 years ago
Yvan	b6d38f7f2e	KERNEL-9860 插件修改xml中active标签逻辑重构跟vito讨论了下，决定模板报错的一键处理这儿，也是需要修改xml的，因为也是用户自己点的处理	3 years ago
zheng	b56616d078	Pull request #7102 : CHART-22213 cherry pick to final10.0 fix:新增警戒线默认应该是9px12px 不是9px Merge in DESIGN/design from ~ZHENG/c-design:final/10.0 to final/10.0 * commit '6c57ae3713ab5b5bb8c807d6b5e33adcb29b7988': CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px	3 years ago
shine	6c57ae3713	CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px	3 years ago
Hades	8a015c7039	Pull request #7099 : REPORT-64095 websocket频繁出现断开又连上问题 Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0 * commit 'c6677e6906cb0f518aa8d76e56fb18e196a88928': REPORT-64095 websocket频繁出现断开又连上问题	3 years ago
Yvan	6f497ae0f8	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Yvan	cbdbc9d5d0	KERNEL-9860 插件修改xml中active标签逻辑重构【问题原因】rt 【改动思路】详见https://kms.fineres.com/pages/viewpage.action?pageId=289590798 【review建议】	3 years ago
hades	c6677e6906	REPORT-64095 websocket频繁出现断开又连上问题	3 years ago
Tommy	4fe9b0b460	Pull request #7097 : REPORT-63505 解决10.0合11.0导致的逻辑冲突 Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0 * commit '027b84bf62fd27182aaf592b9f8834adbc186943': REPORT-63505 解决10.0合11.0导致的逻辑冲突	3 years ago
Tommy	027b84bf62	REPORT-63505 解决10.0合11.0导致的逻辑冲突	3 years ago
ju\|剧浩宇	40d9f356b0	Pull request #7086 : 无jira任务， release/10.0 合 release/11.0 Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0 * commit '915e971afa97e76c767aa6dbd80a6c74df419d98': REPORT-64013 社区url修正（添加锚点标致） CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表 REPORT-60161 【组件背景分离】设置九点图的线在边界上后，其他操作回来发现恢复成默认井字型 REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 REPORT-63322 决策报表及聚合报表，无法拖动组件 REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败	3 years ago
shine	915e971afa	conflict	3 years ago
superman	fa22a67573	Merge pull request #7083 in DESIGN/design from final/10.0 to release/10.0 * commit '5253726980101f35b1953c592db97d13fdff3fca': REPORT-64013 社区url修正（添加锚点标致）	3 years ago
fanglei	44a561e373	Pull request #7077 : REPORT-64013 社区url修正（添加锚点标致） Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit '63f849ee85d95fdf8dd34edc67f7d95fd769de02': REPORT-64013 社区url修正（添加锚点标致）	3 years ago
fanglei	5253726980	Pull request #7078 : REPORT-64013 社区url修正（添加锚点标致） Merge in DESIGN/design from ~FANGLEI/design:final/10.0 to final/10.0 * commit 'e981ca8eb1d9c0896988891da0bd7a26253a2475': REPORT-64013 社区url修正（添加锚点标致）	3 years ago
方磊	63f849ee85	REPORT-64013 社区url修正（添加锚点标致）	3 years ago
方磊	e981ca8eb1	REPORT-64013 社区url修正（添加锚点标致）	3 years ago
zheng	dd6d55e32b	Pull request #7065 : CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0 * commit '8c767ba1c6a28b78a94e28ec7f49c68c6dfd1d81': CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px	3 years ago
Tommy	dd10d3f57f	Pull request #7059 : REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表 Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0 * commit 'b28939592ea72e48680d9abcb4509da2d94ac8b4': REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表	3 years ago
superman	9887725d41	Merge pull request #7076 in DESIGN/design from release/10.0 to final/10.0 * commit '20970382920669c62ac950e8140be5ed1882069d': REPORT-62804 设计器工具栏的链接改动(社区url改动需求) REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置 REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 update CHART-21584 feat:fvs.chart.font 单位px 范围6-200 REPORT-63092 组件复用-拖入带数据集的复用组件，删除设计画布中的组件后，数据集没有被删除 REPORT-60161 【组件背景分离】设置九点图的线在边界上后，其他操作回来发现恢复成默认井字型 REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 REPORT-63322 决策报表及聚合报表，无法拖动组件 REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败 REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后，自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置	3 years ago
superman	2097038292	Merge pull request #7074 in DESIGN/design from bugfix/10.0 to release/10.0 * commit '656a9d1930552eadd5f90bc0e8aac1d92bf80a7d': REPORT-60161 【组件背景分离】设置九点图的线在边界上后，其他操作回来发现恢复成默认井字型 REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 REPORT-63322 决策报表及聚合报表，无法拖动组件 REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败	3 years ago
superman	0fb21350d9	Merge pull request #7064 in DESIGN/design from release/10.0 to release/11.0 * commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5':	3 years ago
ju\|剧浩宇	90c23893ff	Pull request #7066 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit '9c49620859f0c9cbf2f30b503e780092f77180a0': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
方磊	9c49620859	Merge branch 'release/10.0' into release/11.0 * release/10.0: REPORT-62804 设计器工具栏的链接改动(社区url改动需求) # Conflicts: # designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java	3 years ago
shine	8c767ba1c6	Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0	3 years ago
shine	b927d0263d	CHART-22213 fix:新增警戒线默认应该是9px12px 不是9px	3 years ago
superman	656a9d1930	Merge pull request #7063 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
Tommy	b28939592e	REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表	3 years ago
fanglei	39cd7f0434	Pull request #7056 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit '123b0ce7e144e9952abf6aac425c657f9fafc70e': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
fanglei	c5d3fc981a	Pull request #7057 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit 'e691b1a8ac5e9733ca4bc2a8b9521f9aade23507': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
方磊	e691b1a8ac	REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
方磊	123b0ce7e1	REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
superman	8d837c1be6	Merge pull request #7049 in DESIGN/design from release/10.0 to release/11.0 * commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
superman	7a37840f23	Merge pull request #7048 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
fanglei	861c84c4ae	Pull request #7032 : REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置 Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit 'a0798b48218e0f93de6a42859ff3504c4e22d5ce': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
superman	c3f92ba838	Merge pull request #7043 in DESIGN/design from final/11.0 to release/11.0 * commit 'fbe67c0078e40d21dc66f6bd228371c8abe2be4e':	3 years ago
superman	fbe67c0078	Merge pull request #7042 in DESIGN/design from persist/11.0 to final/11.0 * commit 'fa53222ff9d5a23d6fc99f0df0144ca10d324d72':	3 years ago
ju\|剧浩宇	fe7868a7a0	Pull request #7038 : 无JIRA 代码合并 Merge in DESIGN/design from ~EASON/design:release/11.0 to release/11.0 * commit '0497bd25f5fb74eacca507ac66ac7ecf02f6e57c': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 update CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
eason	0497bd25f5	conflict resolve	3 years ago
superman	7439a1d4d8	Merge pull request #7036 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '13f832ef783feff089e210601d6bc2be4f3a38bc': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 update CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
方磊	a0798b4821	REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
superman	fa53222ff9	Merge pull request #7031 in DESIGN/design from final/11.0 to persist/11.0 * commit '7b3aafba5ec2389cf15bbd0971697ee6a440e090':	3 years ago
fanglei	13f832ef78	Pull request #7029 : REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit 'ca2fcb358e038e9564ac0f5edc6aad48c554316d': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题	3 years ago
方磊	ca2fcb358e	REPORT-63092 漏传了import语句	3 years ago
方磊	72b7bdacae	REPORT-63499	3 years ago
方磊	c19bb8edeb	REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题	3 years ago
zheng	11bdd55efc	Pull request #7027 : CHART-21584 feat:fvs.chart.font 单位px 范围6-200 Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0 * commit 'adf49bfded20a12f7fc261119314b1fc582069f4': update CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
shine	adf49bfded	update	3 years ago

1 2 3 4 5 ...

16619 Commits (0da1ac1ad09fac56089d5751e736c6ab9d08c902) All Branches Search

16619 Commits (0da1ac1ad09fac56089d5751e736c6ab9d08c902)

All Branches