kerry
6f64f92410
Pull request #4525 : REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '59d5958c8cc39df0bd7182ea0f39ab7b6e06d89f':
REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
3 years ago
kerry
59d5958c8c
REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
3 years ago
kerry
132ebb8a69
Pull request #4522 : REPORT-53328 视觉调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '9c51640be0cd67477df803d0ff7fb61319de6e79':
视觉调整
3 years ago
kerry
9c51640be0
视觉调整
3 years ago
7f27a55793
Merge pull request #4519 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'c3d729b956f6a30452891fb1d259f3ea8eaf5618':
REPORT-53229 补上空格
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
c3d729b956
Merge pull request #4518 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6bc3b5c0a0d89704a3a0f55b5ceee1273b076173':
REPORT-53229 补上空格
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
kerry
311d096961
Pull request #4514 : REPORT-53365 && REPORT-53310 交互修改
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'a92a5c82d8c6781f13a4c3105ceb871c5b962dfe':
REPORT-53365 && REPORT-53310 交互修改
3 years ago
kerry
a92a5c82d8
REPORT-53365 && REPORT-53310 交互修改
3 years ago
Hades
80f2959213
Pull request #4513 : KERNEL-7634 依赖问题
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '0afe612090338c0feed70fc5e8acce2924afc564':
KERNEL-7634 依赖问题
3 years ago
0afe612090
KERNEL-7634 依赖问题
3 years ago
Hades
28ba84a129
Pull request #4509 : REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '4b2f2d51d8e60ea395c21472fecee26e21c0dae0':
REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误
3 years ago
6bc3b5c0a0
Pull request #4508 : REPORT-53229 设计器顶部版本号信息改为小版本信息
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit '6e1c75179cbb8de8ae6aba3d3d0980fe20949802':
REPORT-53229 补上空格
3 years ago
0de58d4dbb
Pull request #4506 : REPORT-53240 加密组件在服务器上预览不显示
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '8a61c789df0e89c032ba6ffb44e81955fd388975':
REPORT-53240 加密组件在服务器上预览不显示
3 years ago
af36a7a6df
Merge pull request #4505 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'b677a3fc35d0f0d9f528c69dbe2c613bf8fc6d08':
REPORT-53019 字体检查国际化显示不全
3 years ago
Lanlan
398fc83780
Pull request #4507 : REPORT-51360 【10.0.17】设计器用户登录策略调整
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit 'd727b8f4244e224311d00fb709b8ae46bb6bedc1':
REPORT-51360 设计器通行证和finedb里的区分开，对不支持jxbrowser的系统做兼容处理
REPORT-51360 新增模板商城toast提示
兼容处理
REPORT-51360 【10.0.17】设计器用户登录策略调整
3 years ago
4b2f2d51d8
REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误
3 years ago
6e1c75179c
REPORT-53229 补上空格
3 years ago
02895b37ef
Pull request #4493 : REPORT-53229 设计器顶部版本号信息改为小版本信息
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'd96a9af5531cf3dd8fb2885a65b3c0e33aea502e':
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
Hades
93581e168b
Pull request #4495 : KERNEL-7634 mac和win使用不同版本的jxbrowser
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '9dc3b6b87709b24fd9c0e8e0f485f05a3574a1d8':
KERNEL-7634 mac和win使用不同版本的jxbrowser
3 years ago
Bjorn
778b7e3a94
Pull request #4494 : CHART-19475 条件属性的标签固定宽度
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '9fba224bf5486ce54901b1dffac10fe03d29a467':
CHART-19475 条件属性的标签固定宽度
3 years ago
Lanlan
d727b8f424
REPORT-51360 设计器通行证和finedb里的区分开，对不支持jxbrowser的系统做兼容处理
3 years ago
8a61c789df
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
50d105b4a5
REPORT-53240 加密组件在服务器上预览不显示
3 years ago
kerry
68869c55c6
Pull request #4491 : KERNEL-7974 && REPORT-53328 && REPORT-53314 交互修改 看下新的控件式组件做成插件支持需要开放什么接口
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '0c0ba054b9ff2e983150c4800514deccda0e98f1':
REPORT-53328 && REPORT-53314 交互修改
KERNEL-7974 看下新的控件式组件做成插件支持需要开放什么接口
3 years ago
Lanlan
f3a19d05d2
REPORT-51360 新增模板商城toast提示
3 years ago
b677a3fc35
Merge pull request #4504 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2f7bfcf35c70e8de3ad63d97efca22dffd4c2628':
3 years ago
2f7bfcf35c
Merge pull request #4503 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e550094e84048dc6d215bcd29cc9e3a366094cba':
3 years ago
e550094e84
Merge pull request #4501 in DESIGN/design from release/10.0 to final/10.0
...
* commit '9cf4175e88eff3d534aa18a9ccd00ef60593b70c':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
REPORT-52933 [阻止]修改log导出配置目录后，log一直为空
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-49014 update 修改下国际化key
REPORT-49014 连接同一个远程环境，同时双击打开同一个模板 一人正常打开 一人打开空白
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
代码修改
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
REPORT-51830 tab里报表块设置图片背景，复制粘贴得到的tab里的报表块预览时没有背景了，设计器里看是有图片背景的。0228也有此现象。
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
3 years ago
9cf4175e88
Merge pull request #4500 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'b995b6287d800d462e240bb75ae6528dff7c6858':
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-49014 update 修改下国际化key
REPORT-49014 连接同一个远程环境，同时双击打开同一个模板 一人正常打开 一人打开空白
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
代码修改
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
REPORT-51830 tab里报表块设置图片背景，复制粘贴得到的tab里的报表块预览时没有背景了，设计器里看是有图片背景的。0228也有此现象。
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
3 years ago
b995b6287d
Merge pull request #4498 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8d9aaaef8a5efcf31f4fd2bffe9922f1fc62ed4a':
REPORT-53019 字体检查国际化显示不全
3 years ago
Lanlan
ff203a24fe
兼容处理
3 years ago
e3588a8ba0
Pull request #4461 : REPORT-51958 远程环境检测及同步
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '80fdf1f17da3c985fac6ad7d3974bea2cc986ce1':
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
3 years ago
Lanlan
6eaa4799a0
REPORT-51360 【10.0.17】设计器用户登录策略调整
3 years ago
9dc3b6b877
KERNEL-7634 mac和win使用不同版本的jxbrowser
3 years ago
9fba224bf5
CHART-19475 条件属性的标签固定宽度
3 years ago
d96a9af553
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design10.0 into release/10.0
...
* 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design10.0:
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
3 years ago
9f96ccac1b
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
kerry
0c0ba054b9
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
...
* commit 'e934581e607d234054e7dd3928e72a8d0460078b':
REPORT-53305 去掉匿名内部类对象 隐式持有的外层对象字段
3 years ago
Bruce.Deng
8d9aaaef8a
Pull request #4492 : REPORT-53019 字体检查国际化显示不全
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit '7de187ff092d574937cda40aa508bde9fd5b0afa':
REPORT-53019 字体检查国际化显示不全
3 years ago
80fdf1f17d
REPORT-51958 远程环境检测及同步
3 years ago
Bruce.Deng
7de187ff09
REPORT-53019 字体检查国际化显示不全
3 years ago
Hades
e934581e60
Pull request #4480 : REPORT-53305 去掉匿名内部类对象 隐式持有的外层对象字段
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '7ea886b7599eea9f07c93efe1ea5696d3e5a692a':
REPORT-53305 去掉匿名内部类对象 隐式持有的外层对象字段
3 years ago
kerry
dcc454b0c6
REPORT-53328 && REPORT-53314 交互修改
3 years ago
kerry
7542dcf751
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/10.0
3 years ago
3feeff4a3d
Merge pull request #4487 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '4c2d395dc2149e887c4912ce3c57b41bf5c6823a':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
3 years ago
4c2d395dc2
Merge pull request #4486 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '78d99b427747ad890791323de1bb44fa9fc12056':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
3 years ago
7ea886b759
REPORT-53305 去掉匿名内部类对象 隐式持有的外层对象字段
3 years ago
Bruce.Deng
78d99b4277
Pull request #4471 : REPORT-53019 字体检查国际化显示不全
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit 'f0b03de062cecc49182128667000d2ef6e35b323':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
4 years ago
cd749ed515
REPORT-51958 远程环境检测及同步
4 years ago
Hades
07a6d5d0b8
Pull request #4475 : REPORT-53197 && REPORT-53195 数据集名称替换问题 && REPORT-53216 加速查找 过滤可能的设计器中类
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'c7e5f22acfccf44c58dfa246a6aabe15dfbc9da9':
REPORT-53216 加速查找 过滤可能的设计器中类
REPORT-53197 && REPORT-53195 数据集名称替换问题
4 years ago
kerry
superman
Hades
hades
fanglei
Tommy
Lanlan
方磊
Bjorn
kuangshuai
pengda
白岳
Bruce.Deng