lucian
3bab59843a
REPORT-64412 获取表名使用文本框内容,而非选择的值
3 years ago
lucian
2eaf3b057c
REPORT-62876 表名显示时不用toString,会与初始化时不一致,统一为name
3 years ago
starryi
35f478d106
Pull request #7213 : REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-64262 to feature/x
* commit 'b24c9ebf6e24b8f24246e3d89fbc04074046fcd5':
REPORT-64262 【视觉验收】主题编辑的边框配置完善
3 years ago
Lucian.Chen
1388c227b6
Pull request #7212 : REPORT-64434【11.0.2迭代验收】带模式的数据库选中表再下拉无匹配内容
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/x to feature/x
* commit '5c73cfbe2e17c9fc4ac04d43ba58a0b00234498d':
REPORT-64434【11.0.2迭代验收】带模式的数据库选中表再下拉无匹配内容
3 years ago
Starryi
b24c9ebf6e
REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
【问题原因】
单元格样式预览区域四周要留有外边距
【改动思路】
同上
3 years ago
kerry
8b43bd42cb
Pull request #7210 : REPORT-62533【主题预览图】单元格样式只设置下边框线时,左侧预览图中看不到效果
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'ed44b067ccaee6a7f863604d4206d08c1a306cdd':
REPORT-62533【主题预览图】单元格样式只设置下边框线时,左侧预览图中看不到效果
3 years ago
Hades
7e2fdfd99a
Pull request #7209 : REPORT-64207 单击选中来回切换模板 目录树右上角没有显示锁定状态及icon
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '3df380266de8907397a3b8549d524ee0fadc3448':
REPORT-64207 单击选中来回切换 目录树右上角没有显示锁定状态及icon
3 years ago
lucian
5c73cfbe2e
Merge branch 'feature/x' of https://code.fineres.com/scm/~lucian.chen/design into feature/x
3 years ago
lucian
5546bda83a
REPORT-64434【11.0.2迭代验收】带模式的数据库选中表再下拉无匹配内容
3 years ago
kerry
ed44b067cc
REPORT-62533【主题预览图】单元格样式只设置下边框线时,左侧预览图中看不到效果
3 years ago
hades
3df380266d
REPORT-64207 单击选中来回切换 目录树右上角没有显示锁定状态及icon
3 years ago
Hades
34cf30ba1d
Pull request #7208 : REPORT-64300 远程设计时日志推送问题
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '33e1ac2dde3ffbf1e9de84286b76cde412e8b3a5':
REPORT-64300 远程设计时日志推送问题
3 years ago
starryi
9749beda88
Pull request #7191 : REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-64262 to feature/x
* commit '330343be85654a2249760d4667b08f197985d9c6':
REPORT-64262 【视觉验收】主题编辑的边框配置完善
3 years ago
superman
3462aca957
Merge pull request #7204 in DESIGN/design from release/11.0 to feature/x
...
* commit '87655021f37d46722864d1458de8f2f27e50dac3':
Revert "REPORT-64103 游标分页"
REPORT-64103 游标分页
修改富文本字体限制
无jira任务 单元测试打包
CHART-22075 富文本支持9~11号字体
3 years ago
Henry.Wang
eb2f77d365
Pull request #7206 : REPORT-62440 表头排序内置
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit '3f09f2e7183a325c5bc04da766ebd912d4c8ece5':
REPORT-62440 表头排序内置
3 years ago
hades
33e1ac2dde
REPORT-64300 远程设计时日志推送问题
3 years ago
Hades
da720c54fc
Pull request #7193 : MOBILE-34385 设计器文本控件移动端新增nfc输入
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'd8f6332bd2c565c14c3062d7cfc86bc447edb714':
MOBILE-34385 设计器文本控件移动端新增nfc输入
3 years ago
rinoux
87655021f3
Pull request #7205 : Revert "REPORT-64103 游标分页"
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit '184bc1462dff8d41c6de5610755f0bf6eb9ec538':
Revert "REPORT-64103 游标分页"
3 years ago
rinoux
184bc1462d
Revert "REPORT-64103 游标分页"
...
This reverts commit bd6e6ed7ad
.
3 years ago
Henry.Wang
3f09f2e718
Merge branch 'feature/x' of https://code.fineres.com/scm/~henry.wang/design into feature/x
3 years ago
Henry.Wang
9336b1d7f2
REPORT-62440 表头排序内置
3 years ago
superman
28c946b1c9
Merge pull request #7203 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'c9e56c186c6a4069836713eef7d528a05562ce38':
3 years ago
superman
c9e56c186c
Merge pull request #7202 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '5075be2117e151f3dae70f8e810ba68303e36984':
3 years ago
superman
96d81873b5
Merge pull request #7198 in DESIGN/design from release/10.0 to release/11.0
...
* commit '1b0ae7b6eed937d07f7be3d7ac2bbf5dde6c795e':
无jira任务 单元测试打包
3 years ago
rinoux
689164870d
Pull request #7194 : REPORT-64103 游标分页
...
Merge in DESIGN/design from ~RINOUX/design:feature/x to feature/x
* commit 'c5ad17adbe6a8628be3a23f79d27586cac4e382b':
REPORT-64103 游标分页
3 years ago
rinoux
c5ad17adbe
REPORT-64103 游标分页
3 years ago
hades
d8f6332bd2
MOBILE-34385 设计器文本控件移动端新增nfc输入
3 years ago
rinoux
1d26e370d8
Pull request #7189 : REPORT-64103 新引擎游标分页合11
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'bd6e6ed7ad8b6989a58fa62bbb136420d71cb1f9':
REPORT-64103 游标分页
3 years ago
Starryi
330343be85
REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
【问题原因】
单元格样式预览区域四周要留有外边距
【改动思路】
同上
3 years ago
Henry.Wang
1658378937
Pull request #7188 : REPORT-62440 表头排序内置
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit 'c61ab4d317b0a8f2858f9c53c0181dfb7e3200d4':
REPORT-62440 表头排序内置
3 years ago
rinoux
bd6e6ed7ad
REPORT-64103 游标分页
3 years ago
Henry.Wang
c61ab4d317
Merge branch 'feature/x' of https://code.fineres.com/scm/~henry.wang/design into feature/x
3 years ago
Henry.Wang
9d5349d34b
REPORT-62440 表头排序内置
3 years ago
Xiqiu
9cfd53195c
Pull request #7177 : REPORT-64173 限定具体实现的最大占用布局,优化展示效果
...
Merge in DESIGN/design from ~XIQIU/design:feature/x to feature/x
* commit 'ab7de686bd9df3b563b77c9dab161efacadb63a2':
REPORT-64173 限定具体实现的最大占用布局,优化展示效果
3 years ago
Qinghui.Liu
6a46188353
Pull request #7171 : CHART-22075 富文本支持9~11号字体
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/11.0 to release/11.0
* commit '3dd912b680f726540e9ea7ca8e7ce463c5c5496e':
修改富文本字体限制
CHART-22075 富文本支持9~11号字体
3 years ago
starryi
6a5e5f889d
Pull request #7186 : REPORT-64125 【主题边框】新设计器远程旧服务器,设置的边框预览图上看不到
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x
* commit 'a5d1cd190b9a02347efa5c8a131df7f06455e14e':
REPORT-64125 【主题边框】新设计器远程旧服务器,设置的边框预览图上看不到
3 years ago
superman
5075be2117
Merge pull request #7187 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '7ecbffadbb465c21f88aee4e9b623d071e88590d':
3 years ago
Qinghui.Liu
3dd912b680
修改富文本字体限制
3 years ago
Starryi
a5d1cd190b
REPORT-64125 【主题边框】新设计器远程旧服务器,设置的边框预览图上看不到
...
【问题原因】
远程服务器不支持主题内边框时,CellBorderStyle应该从Style中
导出,否则会导致预览时使用错误的空的边框的对象
【改动思路】
同上
3 years ago
kerry
a3a656124e
Pull request #7172 : KERNEL-9636 && REPORT-63725 新自适应中设计器模块和主 jar 中的重复代码
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'a07d8a9f757ba54cd402f354a9c9c1e59f6cc682':
KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码
3 years ago
superman
6cd7c0409a
Merge pull request #7185 in DESIGN/design from release/11.0 to feature/x
...
* commit '86b4ee0de62df25888cdf27fcfb59b20878f22da':
无jira任务 单元测试打包失败,先屏蔽这边
3 years ago
vito
1b0ae7b6ee
Pull request #7179 : 无jira任务 单元测试打包
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'e103647723b3a40d9fe94d21aabb8ee7acec4593':
无jira任务 单元测试打包
3 years ago
vito
e103647723
无jira任务 单元测试打包
3 years ago
vito
86b4ee0de6
Pull request #7178 : 无jira任务 单元测试打包失败,先屏蔽这边
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit '9eeb83cf4a1aeb7272e963d4b96116b6223b6935':
无jira任务 单元测试打包失败,先屏蔽这边
3 years ago
vito
9eeb83cf4a
无jira任务 单元测试打包失败,先屏蔽这边
3 years ago
xiqiu
ab7de686bd
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
xiqiu
987923d5f8
REPORT-64173 限定具体实现的最大占用布局,优化展示效果
3 years ago
kerry
a07d8a9f75
KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码
3 years ago
Elijah
6f8046a07a
Pull request #7170 : REPORT-64286 fix: 内嵌tomcat不支持websocket
...
Merge in DESIGN/design from ~ELIJAH/design:feature/x to feature/x
* commit 'ea86dd59d5321ac3c3da88290203428bb2f225aa':
REPORT-64286 fix: 内嵌tomcat不支持websocket
3 years ago
Hades
59c499244b
Pull request #7168 : REPORT-64156 解锁失败加个提示弹窗
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'e0acf704977d236ea08475b5ad537dc6ef71ba5a':
REPORT-64156 解锁失败加个提示弹窗
3 years ago