Tommy
e24561bee7
Pull request #6143 : REPORT-60493 REPORT-60471 REPORT-60472 REPORT-60486 REPORT-60488 REPORT-60489 bug fixed
...
Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x
* commit '17ba276c01a477040ef5a553b56f15d32d9eff3f':
REPORT-60489 主题切换弹窗提示文字修改&&解决长按导致底部dialog显示在最上层
REPORT-60488 视觉优化
REPORT-60486 布局切换引导拖拽问题&去除预览
REPORT-60472 气泡提示文字不应该可以修改
REPORT-60493 主题下载引导场景
REPORT-60471 跟随主题点击后没有效果
REPORT-60493 主题下载引导场景
3 years ago
Fly.Li
836917586d
Pull request #6146 : REPORT-60578:解决报表引擎属性面板中新计算引擎相关选项未完全屏蔽的bug
...
Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x
* commit 'd7625f987faea2b7110bd9d306fee8043ff34f8a':
REPORT-60578:解决报表引擎属性面板中新计算引擎相关选项未完全屏蔽的bug
3 years ago
fly.li
d7625f987f
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
fly.li
53f02de039
REPORT-60578:解决报表引擎属性面板中新计算引擎相关选项未完全屏蔽的bug
3 years ago
kerry
3c8b5026c9
Pull request #6128 : REPORT-58717【主题切换】frm主题左侧预览效果调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '14a14a7c27562fb965d5d07d028396916b2f2fda':
REPORT-58717【主题切换】frm主题左侧预览效果调整
3 years ago
kuangshuai
17ba276c01
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
11dc3aa587
REPORT-60489 主题切换弹窗提示文字修改&&解决长按导致底部dialog显示在最上层
3 years ago
superman
415130fa9d
Merge pull request #6137 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'b870ed2b5313da523429bb2b884f5b36b744bc0a':
fix:兼容大屏组件的cpt设置
3 years ago
kuangshuai
34cba1be0b
REPORT-60488 视觉优化
3 years ago
kuangshuai
35905bc6a4
REPORT-60486 布局切换引导拖拽问题&去除预览
3 years ago
kuangshuai
c33e4fe1d9
REPORT-60472 气泡提示文字不应该可以修改
3 years ago
kuangshuai
b574b7723c
REPORT-60493 主题下载引导场景
3 years ago
kuangshuai
5a443585e8
REPORT-60471 跟随主题点击后没有效果
3 years ago
kuangshuai
4aaf16c00c
REPORT-60493 主题下载引导场景
3 years ago
superman
b870ed2b53
Merge pull request #6133 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '954a20aaebe1f09d09c1571a423a984f849d5e7f':
fix:兼容大屏组件的cpt设置
3 years ago
superman
954a20aaeb
Merge pull request #6132 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '66a242a88dcbfaf57a6ec9bf043e8662608ef844':
fix:兼容大屏组件的cpt设置
3 years ago
superman
66a242a88d
Merge pull request #6131 in DESIGN/design from final/10.0 to release/10.0
...
* commit '4bc26630ab18f697c705f3a1d94e7d936223aaad':
fix:兼容大屏组件的cpt设置
3 years ago
Bruce.Deng
cafb2f81cd
Pull request #6121 : REPORT-58836 自定义导出二期
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/x to feature/x
* commit 'ff38272d39fc680b701014505d4d0790780924e2':
REPORT-58836 自定义导出二期
3 years ago
pengda
145c8465b4
Pull request #6120 : REPORT-60380 固定行数分页-服务器配置中,每页显示行数无法输入6789
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit '7fe462a7c91c0776157a2d999583214531788cb2':
REPORT-60380 固定行数分页-服务器配置中,每页显示行数无法输入6789
3 years ago
wei
c18d6c28e3
Pull request #6129 : 无任务 解决打包失败
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit '2888e874caed3c4d52fa01576f24c7ee23a7550b':
无任务 解决打包失败
3 years ago
Henry.Wang
2888e874ca
无任务 解决打包失败
3 years ago
Henry.Wang
1b7c4bcf3f
Pull request #6125 : release/11.0 合 feature/x 解决冲突
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit '6d6be3b0c52b49dea53ce0e14f15fe286faff4a2':
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-60134 表单组件属性国际化-显示不全
3 years ago
kerry
14a14a7c27
REPORT-58717【主题切换】frm主题左侧预览效果调整
3 years ago
Henry.Wang
6d6be3b0c5
解决冲突
3 years ago
eason
4bc26630ab
Pull request #6124 : CHART-20651:兼容插件的cpt设置
...
Merge in DESIGN/design from ~EASON/design:release/10.0 to final/10.0
* commit '5034de4cb7cdabdbda27d9c1ac398f7652ceae71':
fix:兼容大屏组件的cpt设置
3 years ago
neil
907478282b
Pull request #6123 : 无JIRA任务 解决冲突的时候合并代码错误
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit 'e6387ef078c06f82d82b765cd425eef7c2f02147':
无JIRA任务 解决冲突的时候合并代码错误
3 years ago
eason
5034de4cb7
fix:兼容大屏组件的cpt设置
3 years ago
方磊
e6387ef078
无JIRA任务 解决冲突的时候合并代码错误
3 years ago
starryi
2352e6a4ae
Pull request #6111 : REPORT-60431 & REPORT-60437 & REPORT-60403
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-57806 to feature/x
* commit 'b06cfadd2becfe64cd7e2d211f31d54418408bb4':
REPORT-60403 【主题获取】兼容主题下生成的组件,目前还是存了主题信息
REPORT-60437 【主题获取】获取主题时,没有弹出模板主题列表
REPORT-60431 【主题获取】组件右键时,下载按钮依旧存在
3 years ago
Bruce.Deng
ff38272d39
REPORT-58836 自定义导出二期
3 years ago
pengda
7fe462a7c9
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
4f4ed3249c
REPORT-60380 固定行数分页-服务器配置中,每页显示行数无法输入6789
3 years ago
ju|剧浩宇
239eb191e6
Pull request #6115 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit '41113745d4478dee86f4a128060b74214d7e5333':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
方磊
41113745d4
Merge branch 'feature/10.0' into feature/x
...
* feature/10.0:
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
# Conflicts:
# designer-form/src/main/java/com/fr/design/gui/xpane/LayoutStylePane.java
3 years ago
superman
a6aa51a28e
Merge pull request #6110 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '51046bcfe534ba5ab3624b958ac4c2522983bae6':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Starryi
b06cfadd2b
REPORT-60403 【主题获取】兼容主题下生成的组件,目前还是存了主题信息
...
【问题原因】
若生成共享组件时使用的时兼容主题,则共享组件那的样式应当时自定义状态
【改动思路】
同上
3 years ago
Starryi
bcb00232b1
REPORT-60437 【主题获取】获取主题时,没有弹出模板主题列表
...
【问题原因】
主题获取交互优化
【改动思路】
同上
3 years ago
Starryi
234c29f4a7
REPORT-60431 【主题获取】组件右键时,下载按钮依旧存在
...
【问题原因】
主题获取交互优化
【改动思路】
同上
3 years ago
superman
51046bcfe5
Merge pull request #6109 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '0cdec8f89502fd61cb4db57f53081445994c9ba8':
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
superman
0cdec8f895
Merge pull request #6108 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2d3e4f47a55d5a1c11efecf37e4d924f626f0288':
3 years ago
Henry.Wang
5b5278895a
Pull request #6100 : REPORT-59681 远程设计控制模板自适应权限控制
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '511d6e6aa63598e71f49cfbb4241fcf099f83419':
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
superman
2d3e4f47a5
Merge pull request #6106 in DESIGN/design from release/10.0 to final/10.0
...
* commit '90e8684e1d507b7bc24540a5460924d256c3a047': (38 commits)
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
REPORT-60004 远程设计-保存弹窗 目录显示问题
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全
add executeJavaScriptAndReturnValue function
...
3 years ago
superman
90e8684e1d
Merge pull request #6105 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'ff712425a3839c4503002b2e964bf9f357a2550a':
3 years ago
eason
8f6bd92877
Pull request #6099 : 无JIRA任务 代码合并
...
Merge in DESIGN/design from feature/10.0 to release/10.0
* commit '75a372ffb25c1d470c15c638b7e92839122ce17d':
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
superman
ff712425a3
Merge pull request #6103 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '387fb172f7cb52a0c5bf0301e07147949862b6c9':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Henry.Wang
511d6e6aa6
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Henry.Wang
387fb172f7
Pull request #6084 : REPORT-59681 远程设计控制模板自适应权限控制
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '8edae1949cb668399f4d4341b8e60dafe81b61da':
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Hades
6c47b1513c
Pull request #6093 : REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '25f5999d450e06a472edfa5db935e76ddc5f5347':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
3 years ago
kerry
00701c0b8c
Pull request #6083 : REPORT-60266 主题配色编辑框样式修改
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'f5be3e61e9577acfbefce38d94fa9ed5e20f2e56':
REPORT-60266 主题配色编辑框样式修改
3 years ago
fanglei
25ce7fe833
Pull request #6098 : REPORT-60134 表单组件属性国际化-显示不全
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '5160ced244fb84d2d512522a23914e6146d05e82':
REPORT-60134 表单组件属性国际化-显示不全
3 years ago