kuangshuai
cc31d98171
REPORT-60637 国际化
3 years ago
kuangshuai
a064c43c97
REPORT-60488 视觉优化
3 years ago
kuangshuai
ebf80e424b
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x
3 years ago
kuangshuai
b8e4fdb55a
REPORT-60637 引导加载页
3 years ago
fanglei
18290876bd
Pull request #6148 : 无JIRA任务,有一处语法报错的地方修复一下
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit '2e04913277dcca872b9b7b61bde4d40b732f68a2':
无JIRA任务,有一处语法报错的地方修复一下
3 years ago
kerry
283d38a471
Pull request #6150 : REPORT-60509【固定布局-原布局推荐4.1】拖拽复用组件到空白块,已拖入的组件会自动变化大小
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'abeb61ff79a006926f23ed365f74a5aedb056ec1':
REPORT-60509【固定布局-原布局推荐4.1】拖拽复用组件到空白块,已拖入的组件会自动变化大小
3 years ago
starryi
6f0ec62db6
Pull request #6122 : REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-59963/feature/x to feature/x
* commit '652f107a259e286c4b9ce2b7ef560315ee247efa':
REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
starryi
bc11ed7c14
Pull request #6126 : REPORT-60402 【主题获取】获取的酷炫蓝组件主题,名称乱码
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-57806 to feature/x
* commit '793abc279b8df92e13b3ad366dc13e9dcd84dbd3':
REPORT-60402 【主题获取】获取的酷炫蓝组件主题,名称乱码
3 years ago
starryi
4aef617686
Pull request #6138 : REPORT-59901 单元格样式设置项和预览区调整
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-59901 to feature/x
* commit '83dd9ddaf4a0d8cde5c6c949916ccab628f9a0d8':
REPORT-59901 单元格样式设置项和预览区调整
REPORT-59901 单元格样式设置项和预览区调整
REPORT-60171 【主题切换】单元格样式设置透明底色效果不对,且有错乱效果
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
3 years ago
starryi
9345a2eb99
Pull request #6127 : REPORT-59897 内边距范围调整-设计器内
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-59897 to feature/x
* commit '0e02afd3d9ba1719c03e78b5a6e6e2da3b5d6626':
REPORT-59897 内边距范围调整-设计器内
3 years ago
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
kerry
abeb61ff79
REPORT-60509【固定布局-原布局推荐4.1】拖拽复用组件到空白块,已拖入的组件会自动变化大小
3 years ago
方磊
2e04913277
无JIRA任务,有一处语法报错的地方修复一下
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
Starryi
83dd9ddaf4
REPORT-59901 单元格样式设置项和预览区调整
...
【问题原因】
格式设置从单元格样式中移除,同时与主题中的单元格样式完全独立。
用户可单独配置.
【改动思路】
同上
3 years ago
Starryi
4051a1cc1b
REPORT-59901 单元格样式设置项和预览区调整
...
【问题原因】
1. 去掉主题编辑面板中的配色预览
2. 单元格对齐-“间距”改名为“行间距”
【改动思路】
同上
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
Starryi
c157fbcb58
REPORT-60171 【主题切换】单元格样式设置透明底色效果不对,且有错乱效果
...
【问题原因】
透明底色图片的透明度正常,不过单元格样式预览界面在
windows上存在重影问题,需要修复下。
【改动思路】
绘制单元格样式预览内容前清空画布
3 years ago
Starryi
6cb031ae64
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
...
【问题原因】
点九图边界线值为0也是有效值
【改动思路】
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
Starryi
0e02afd3d9
REPORT-59897 内边距范围调整-设计器内
...
【问题原因】
1. 内边距需要对标题文本也生效,当文本对齐方式为左对齐/右对齐时,
不应该再顶格放置了。即内边距从过去的对主体区域生效,改为对组件
外沿生效。有标题时,原主体区域上方的间距,现在就没了。
2. 边框需要从内边框变为正边框,即去掉原来1px的位移。
【改动思路】
同上
3 years ago
Starryi
793abc279b
REPORT-60402 【主题获取】获取的酷炫蓝组件主题,名称乱码
...
【问题原因】
客户机环境问题,导致读取主题XML文件时使用的默认编码有误
【改动思路】
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
652f107a25
REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
...
【问题原因】
调整Tab块样式导致样式刷新时,标题栏的样式均被初始化
【改动思路】
1. Tab组件虽然在样式面板上没有设置标题样式的设置项,即
TitlePacker,但依然使用了标题样式相关的字段,如背景,
是否显示标题栏等,这些标题相关的字段不能在调整样式时被重置,
所以需要在Tab的StylePane中始终保持
2. Tab组件的样式数据初始化应该在数据模型层完成
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