9594293125
Pull request #6761 : REPORT-62974 引导提示文字与按钮实际文字不一致
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '122b5e86cd5db47ab21d90133b01739c643ba54c':
REPORT-62974 引导提示文字与按钮实际文字不一致
3 years ago
834cef3ba7
Pull request #6768 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'a02ea7988e90e46d5dff91d0d66a1858d54c91d8':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
a02ea7988e
Merge branch 'release/10.0' into release/11.0
...
* release/10.0:
REPORT-62275 tab高度弹窗撤销问题
# Conflicts:
# designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
3 years ago
ab07c4a63c
Pull request #6759 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'b7287df4749f12276f4908d2277d4fd7c21e232a':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
5e273681fe
Pull request #6767 : 无jira任务， release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '2a4d3e38214e207df2ce676d5c2a2b619ce23f05':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现
REPORT-62275 tab高度弹窗撤销问题
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
92d1d8b90c
Pull request #6766 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '19b7fcb536e8ef99218cca5827601eeb6c8ea46e':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
2a4d3e3821
无jira任务， release/10.0 合 release/11.0 解决冲突
3 years ago
19b7fcb536
REPORT-62275 tab高度弹窗撤销问题
3 years ago
122b5e86cd
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0
3 years ago
e125cbe2d9
REPORT-62974 引导提示文字与按钮实际文字不一致
3 years ago
b7287df474
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design into release/11.0
...
* 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design:
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 代码质量问题
REPORT-62896 替换常量
REPORT-62896 下载主题引导过程中概率性退出引导问题
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 【问题原因】设计器里没适配 【改动思路】1. 适配下弹窗提示；2. 之前把forbid-reminder放到PluginView里还是不合适，换成通过xml获取的方式 【review建议】无
3 years ago
07d4884230
REPORT-62275 tab高度弹窗撤销问题
3 years ago
Hades
f15b3ee273
Pull request #6757 : CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'ccaa4cf79a164a7bc61facc7d9ef7cbf96b3856b':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现
3 years ago
a75436f092
Pull request #6756 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '1b52c54a85171a2e46e2170096c9f66264023d8a':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
ccaa4cf79a
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现
3 years ago
819ee73425
Pull request #6755 : REPORT-62896 下载主题引导过程中概率性退出引导问题
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'dbb9bb6ce7083fb2b0cebbaee3206db3238ff75f':
REPORT-62896 替换常量
REPORT-62896 下载主题引导过程中概率性退出引导问题
3 years ago
1b52c54a85
REPORT-62275 tab高度弹窗撤销问题
3 years ago
5c51007a5c
Pull request #6728 : REPORT-62275&REPORT-62275 表单拖入失败-自动撤销&tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '60edfb2cbdaa50ba950ed4d1a54982de15cd9cbb':
REPORT-62275&REPORT-61827
REPORT-62275
REPORT-61827
REPORT-62275 表单拖入失败-自动撤销
3 years ago
Yvan
6d2d495ffd
Pull request #6754 : REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
Merge in DESIGN/design from ~YVAN/design:release/11.0 to release/11.0
* commit '3e6b0f874e3928d485c059ac61b8010a2fb30a99':
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 代码质量问题
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 【问题原因】设计器里没适配 【改动思路】1. 适配下弹窗提示；2. 之前把forbid-reminder放到PluginView里还是不合适，换成通过xml获取的方式 【review建议】无
3 years ago
yvan
3e6b0f874e
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
代码质量问题
3 years ago
Hades
afbe5f618a
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit 'd72bc467a66226d2083ee76b5e787eb4aaeeba8e':
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
dbb9bb6ce7
REPORT-62896 替换常量
3 years ago
4b1d31cfa1
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0
3 years ago
ed0a2090df
REPORT-62896 下载主题引导过程中概率性退出引导问题
3 years ago
d72bc467a6
Pull request #6731 : REPORT-62554 再打开设计器模板会空白
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'a992039144f20522d64e707de1da6ec46e4bed2c':
REPORT-62554 再打开设计器模板会空白
3 years ago
zheng
5edddd28f7
Pull request #6742 : CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '042a5d0752f90a7dc197087a5040f744dad25064':
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
3 years ago
60edfb2cbd
REPORT-62275&REPORT-61827
3 years ago
yvan
8c72116a9f
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
3 years ago
yvan
8368200619
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
【问题原因】设计器里没适配
【改动思路】1. 适配下弹窗提示；2. 之前把forbid-reminder放到PluginView里还是不合适，换成通过xml获取的方式
【review建议】无
3 years ago
0ae062a012
REPORT-62275
3 years ago
shine
042a5d0752
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
15341520dd
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
3 years ago
50e2c75306
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design into release/11.0
...
* 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design:
REPORT-60748 决策报表-属性-坐标尺寸交互问题
CHART-21951 第三方图表插件无法创建复用组件
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
f9f08a48fe
Pull request #6710 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '310489755f999708c8a0b833172444fd14f905c4':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
310489755f
Merge branch 'release/10.0' into release/11.0
...
* release/10.0:
REPORT-60748 决策报表-属性-坐标尺寸交互问题
# Conflicts:
# designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
# designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
# designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
# designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
3 years ago
a992039144
REPORT-62554 再打开设计器模板会空白
3 years ago
a51db42343
REPORT-61827
3 years ago
66ca0d8d92
Pull request #6703 : REPORT-60748 决策报表-属性-坐标尺寸交互问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '3ae5bc3743bc43f33fdb3c7e4c6498675c7c6dd1':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
3ae5bc3743
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design into release/10.0
...
* 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design: (55 commits)
CHART-21951 第三方图表插件无法创建复用组件
REPORT-62088 来回切换两个单元格及其的排序按钮，几十次后，排序按钮点击
CHART-21665 design fix:仪表盘刻度配色保存异常处理
REPORT-62133 mac设计器安装包起不来
REPORT-62437 安装大数据集导出excel插件后，远程和本地互相切换时保存失败问题
REPORT-62142 fix 解密条件 关注内置的两种模板类型即可
REPORT-62142 加密模板在json数据集插件禁用启用后的模板数据集无法正常显示
REPORT-62133 mac设计器安装包起不来
CHART-21786:不限制图片标记点大小
REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题
REPORT-61654 弹窗内容显示不全
REPORT-61610 fix:回退最开始关于 相同的图表类型，不会新建图表配置界面 的逻辑改动
REPORT-62179 数字控件的最大最小值校验需支持公式
REPORT-62016 BI插件匹配检测
REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null
update
代码质量：每个实例各自监听插件事件
REPORT-61695
REPORT-61618 复用组件生成时带“-”，导致部分公式失效@Jaimme
REPORT-61610 fix:插件重新加载 图表配置界面报错 A.class can not cast to A.class
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
3 years ago
3430b56fae
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
233336dfc5
Pull request #6695 : 无jira任务， release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'fa28bf6a5b8a8d4c8ff7bff1d1d67531c18abd1b':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
fa28bf6a5b
Merge branch 'release/10.0' into release/11.0
...
# Conflicts:
# designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java
3 years ago
353485f0dd
Pull request #6690 : CHART-21951 第三方图表插件无法创建复用组件
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'd2c39de9d3229333e467f81c844a3b4886a89eef':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
86e12dcc44
Pull request #6688 : CHART-21951 第三方图表插件无法创建复用组件
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '39703b20da47fb1ae4bb0d5506a2496e3710e22c':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
d2c39de9d3
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
39703b20da
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
e49f8cd9c9
REPORT-62275 表单拖入失败-自动撤销
3 years ago
ca278d8016
Pull request #6644 : REPORT-62539 不触发事件了，直接改可见性
...
Merge in DESIGN/design from ~XIQIU/design:release/11.0 to release/11.0
* commit 'aee7de437134a246ad3d31e4fc0dab0ccbde53e6':
REPORT-62539 优化下代码
REPORT-62539 不触发事件了，直接改可见性
3 years ago
aee7de4371
REPORT-62539 优化下代码
3 years ago
ae1f9389c6
Merge pull request #6667 in DESIGN/design from release/10.0 to release/11.0
...
* commit 'b29fc795a1afcbad129450d321161f6323f3afe2':
REPORT-62088 来回切换两个单元格及其的排序按钮，几十次后，排序按钮点击
3 years ago
Tommy
ju|剧浩宇
方磊
fanglei
Henry.Wang
Hades
hades
Yvan
zheng
kuangshuai
Xiqiu
superman