design

Commit Graph

Author	SHA1	Message	Date
kerry	949b249bbf	国际化 key 值修改	3 years ago
kerry	4906987ea7	REPORT-60313【开发者预览支持调整模板布局】新自适应-没在目录里的模板直接设计器打开后开发者调试预览，触发保存会失败	3 years ago
kerry	fcc2f1c898	魔鬼数字	3 years ago
kerry	7eefd96056	REPORT-60012 主题管理-编辑主题-预览界面国际化	3 years ago
kerry	27ecb2831a	Pull request #6030 : REPORT-59906 && REPORT-60158 【固定布局-原布局推荐4.1】决策报表-固定布局下往绝对画布块上拖的时候效果不对；【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件，拖入到占位块后，整体缩小了，但里面的子组件没有等比例缩小 Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit 'a1bb9bc52de1b777de11ad96ae28716b23960222': 更新下布局模板 REPORT-59906【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件，拖入到占位块后，整体缩小了，但里面的子组件没有等比例缩小	3 years ago
starryi	4c9e220974	Pull request #5982 : REPORT-57806 主题获取 Merge in DESIGN/design from ~STARRYI/design:REPORT-57806 to feature/x * commit 'b1b583d34fe2f26c9a748869ef720ec775e5df28': REPORT-57806 主题获取	3 years ago
superman	21eae78836	Merge pull request #6055 in DESIGN/design from feature/10.0 to feature/x * commit '9b7f720b36e49d3e3778c8bb1ac66047e0a6658b': REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置	3 years ago
superman	9b7f720b36	Merge pull request #6052 in DESIGN/design from bugfix/10.0 to feature/10.0 * commit '1857733955f72a2073d621247e495d65a9e79542': REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置	3 years ago
Lucian.Chen	1857733955	Pull request #6029 : REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置 Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0 * commit 'cc19c999e3fa7c27929d108ca6b75406b1df8f37': REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置	3 years ago
Tommy	78b79d1c8a	Pull request #5983 : REPORT-57813 新功能引导 Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x * commit 'df617491579d70e9b237464755ce239ae5b84fe6': REPORT-59858 引导页场景开发 REPORT-59629 引导页框架	3 years ago
pengda	d3fd97dc0e	Pull request #6047 : REPORT-58039 支持固定行数分页 Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x * commit 'fab2c94ade321a4512def20efef1bbc4564031d1': REPORT-58039 支持固定行数分页	3 years ago
pengda	fab2c94ade	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
pengda	4dc13ed1ad	REPORT-58039 支持固定行数分页	3 years ago
pengda	68af92ad7d	Pull request #6006 : REPORT-58039 支持固定行数分页 Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x * commit 'f06c05029798e468edc15d9c45350dafd5f66ea5': REPORT-58039 支持固定行数分页 REPORT-58039 支持固定行数分页 REPORT-58039 支持固定行数分页 REPORT-58039 支持固定行数分页	3 years ago
kerry	a1bb9bc52d	更新下布局模板	3 years ago
superman	803ec21fd0	Merge pull request #6045 in DESIGN/design from release/11.0 to feature/x * commit 'f726f1ba106729aca49714a0c7a9b1aae51be2e4': REPORT-60077 删除本地性能分析菜单项	3 years ago
kerry	20978231b8	REPORT-59906【固定布局-原布局推荐4.1】决策报表-自适应布局-绝对画布块包含子组件的复用组件，拖入到占位块后，整体缩小了，但里面的子组件没有等比例缩小	3 years ago
lucian	cc19c999e3	REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置	3 years ago
loy	f726f1ba10	Pull request #6005 : REPORT-60077 删除本地性能分析菜单项 Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0 * commit '89a488e37366e9fd20d6e7ed3a34198cab3cbaa0': REPORT-60077 删除本地性能分析菜单项	3 years ago
pengda	f06c050297	REPORT-58039 支持固定行数分页	3 years ago
pengda	8bf479c0d4	REPORT-58039 支持固定行数分页	3 years ago
pengda	f8074f545c	REPORT-58039 支持固定行数分页	3 years ago
superman	ee87f640dc	Merge pull request #6018 in DESIGN/design from release/11.0 to feature/x * commit 'e98af599cd982df89c83545d6397ce71d050cd08': REPORT-56481 修正错误 REPORT-56481 决策报表-模板打开时一直弹出提醒 Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动	3 years ago
superman	e98af599cd	Merge pull request #6017 in DESIGN/design from final/11.0 to release/11.0 * commit '6ba243a75252fda49bc5d33b20edfe840f3f125e': Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动	3 years ago
superman	6ba243a752	Merge pull request #6016 in DESIGN/design from persist/11.0 to final/11.0 * commit 'de53744add24f1a2ef6725f2407bba965c62c04e': REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动	3 years ago
ju\|剧浩宇	8637e9b245	Pull request #6015 : 无JIRA任务解决冲突 Merge in DESIGN/design from zheng-1632710859332 to feature/x * commit '5f263e4d9517862f2eded81584b108bbd9c70d74': 和抽之前完全一样 CHART-21076 清楚磁盘缓存 CHART-20411 适配大屏模板关闭 CHART-20411 适配大屏模板另存为 REPORT-60004 远程设计-保存弹窗目录显示问题 CHART-20686 大屏模板中的图表不支持导出 CHART-20850 fix:大屏模板中试管型仪表盘切换为横向后标签颜色就变了 CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 CHART-20939 design fix: 三维组合地图有类型界面	3 years ago
zheng	5f263e4d95	Fixed merge conflict	3 years ago
superman	6217c56855	Merge pull request #6010 in DESIGN/design from bugfix/10.0 to feature/10.0 * commit '159e071708da5229a675642e7b144c979a83f97d': REPORT-60004 远程设计-保存弹窗目录显示问题	3 years ago
superman	159e071708	Merge pull request #6009 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '1f8bd7a1d6f90d714a8d1520586e39677b959b60': REPORT-60004 远程设计-保存弹窗目录显示问题	3 years ago
pengda	5f6f736441	REPORT-58039 支持固定行数分页	3 years ago
Starryi	b1b583d34f	REPORT-57806 主题获取【问题原因】 1. 实现在线共享组件/组件包的新弹窗界面 2. 实现组件包封面右键按钮列表 3. 共享组件模块中下载和应用主题埋点【改动思路】同上	3 years ago
loy	89a488e373	REPORT-60077 删除本地性能分析菜单项	3 years ago
eason	acf2e8c978	Pull request #5981 : CHART-20411 适配大屏模板文件菜单 Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0 * commit '77c7a84eecde096651e1822302db51d47f79ed8e': 和抽之前完全一样 CHART-21076 清楚磁盘缓存 CHART-20411 适配大屏模板关闭 CHART-20411 适配大屏模板另存为	3 years ago
shine	77c7a84eec	和抽之前完全一样	3 years ago
Hades	1f8bd7a1d6	Pull request #5979 : REPORT-60004 远程设计-保存弹窗目录显示问题 Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0 * commit '71c15a84accd64ae515f8a3ff217758b123b989c': REPORT-60004 远程设计-保存弹窗目录显示问题	3 years ago
kuangshuai	df61749157	Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x	3 years ago
kuangshuai	3c26616dbe	REPORT-59858 引导页场景开发	3 years ago
kuangshuai	d9dbfb3db1	REPORT-59629 引导页框架	3 years ago
shine	291452a0f5	CHART-21076 清楚磁盘缓存	3 years ago
shine	236125c553	Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0	3 years ago
fanglei	c5df6da3fb	Pull request #5980 : 无JIRA任务还原一也是无JIRA任务的改动 Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x * commit '32e6708bc3f6175435f530ead0fbe5b312567ec2': 无JIRA任务还原一也是无JIRA任务的改动	3 years ago
方磊	32e6708bc3	无JIRA任务还原一也是无JIRA任务的改动	3 years ago
fanglei	82ecbcabb5	Pull request #5976 : REPORT-59905&REPORT-59952 若干bug Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x * commit 'c971e997fb1e2d2dff3367a435b1aa19faac0321': REPORT-59952 还原代码 REPORT-59952&无JIRA任务还原代码&click事件感觉用起来不舒服，鼠标点下释放位置偏离一点点就失灵了，改成press事件 REPORT-59905&REPORT-59952 若干bug	3 years ago
方磊	c971e997fb	REPORT-59952 还原代码	3 years ago
方磊	9b73a2fab6	REPORT-59952&无JIRA任务还原代码&click事件感觉用起来不舒服，鼠标点下释放位置偏离一点点就失灵了，改成press事件	3 years ago
shine	ac01b5c6fe	CHART-20411 适配大屏模板关闭	3 years ago
shine	2a967d27f2	CHART-20411 适配大屏模板另存为	3 years ago
hades	71c15a84ac	REPORT-60004 远程设计-保存弹窗目录显示问题	3 years ago
kerry	4a6bd9b0b6	Pull request #5971 : REPORT-59932 【固定布局-原布局推荐4.1】剪切问题 Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit 'ac008319d7992d2d5681efd8fb0acce01f93eb51': 代码调整 REPORT-59948 && REPORT-59948 命名修改 REPORT-59932 【固定布局-原布局推荐4.1】剪切问题	3 years ago
fanglei	a73a338215	Pull request #5978 : REPORT-56481 决策报表-模板打开时一直弹出提醒 Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0 * commit 'cd8c8d3108c8686399fb0342c21b7493bc8b7437': REPORT-56481 修正错误 REPORT-56481 决策报表-模板打开时一直弹出提醒	3 years ago

1 2 3 4 5 ...

15556 Commits (949b249bbf7ff9e298d1ce879e8d61315812691b) All Branches Search

15556 Commits (949b249bbf7ff9e298d1ce879e8d61315812691b)

All Branches