hades
e6c0f39b7d
REPORT-56047 设计器11.0适配内容处理
3 years ago
hades
b9ac083bba
REPORT-56047 设计器11.0适配内容处理
3 years ago
方磊
9f2e530ba4
REPORT-56855 将原来获取修改数据集后的名字的方法改成私有的
3 years ago
hades
15ba9d1f16
REPORT-56047 设计器11.0适配内容处理
3 years ago
Bruce.Deng
dbac374e6e
Pull request #5492 : 无jira任务,冲突
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/11.0 to release/11.0
* commit 'e3f489f5d711d47f097878757e22c5ff3e69bd95':
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑
3 years ago
Bjorn
1b9d4b20ab
Pull request #5490 : CHART-20117 标签字体兼容,升级上来的自动显示跟随主题
...
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '8afcd3a2aab6ba2861db6dbe31d739110f28a374':
CHART-20117 标签字体兼容,升级上来的自动显示跟随主题
3 years ago
Hoky
b24bf45be6
REPORT-57892 公式编辑器优化:实时计算返回结果为日期格式时不正确
...
1.添加一个object2string
3 years ago
kerry
6084470308
Pull request #5494 : REPORT-51919 - 主题切换
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '17f87679c7a054b3206c7190dabe7512e4e9ebfd':
REPORT-51919 - 主题切换
3 years ago
kerry
17f87679c7
REPORT-51919 - 主题切换
3 years ago
starryi
a445cd1982
Pull request #5481 : REPORT-51919 主题切换
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'fc684822f2bb8fdcc6a18080aa1762ebf1977b45':
REPORT-51919 主题切换
3 years ago
Bruce.Deng
e3f489f5d7
Merge branch 'release/10.0' of https://code.fineres.com/scm/~bruce.deng/design into release/11.0
...
Conflicts:
designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
3 years ago
方磊
c81cccaa8a
REPORT-56855 树数据集修改名称后-数据字典内的树数据集名称不会改变
3 years ago
白岳
8afcd3a2aa
CHART-20117 标签字体兼容,升级上来的自动显示跟随主题
3 years ago
Hoky
2b43c7d0e6
REPORT-57892 公式编辑器优化:实时计算返回结果为日期格式时不正确
...
1.添加一个object2string
3 years ago
Xiqiu
71e424f565
Pull request #5480 : REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit '912084ccfb0cbb32270b88277ba121429f4f7ed5':
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
kerry
9dd779c85e
Pull request #5479 : REPORT-51919 - 主题切换
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '2ce997a6b89871772c9bf3cc61d2a05c87cfbb62':
代码修改
代码调整
3 years ago
xiqiu
923bb79aad
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
3 years ago
kuangshuai
04bac5d214
REPORT-57590 表单参数面板不应该能被复制到容器内
3 years ago
kuangshuai
7daf44dcef
REPORT-54538 组件复用无网络提示地址支持选中复制
3 years ago
xiqiu
98f36d90c8
REPORT-55468 改下布局,对齐边界
3 years ago
Starryi
fc684822f2
REPORT-51919 主题切换
...
【问题原因】
新增模版主题功能:
1. 修复将主题应用到模版后,应用按钮未灰化的问题
2. 修复新自适应合并到feature/x中jar后,右侧栏样式面板不显示跟随主题或
自定义按钮的问题
【改动思路】
同上
3 years ago
xiqiu
912084ccfb
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
xiqiu
cc38bcedc5
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
Hades
b1058789ad
Pull request #5478 : REPORT-57647 cpt参数面板中组件被下方覆盖时 工具栏需要不可见
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'f97a0bf7187f88d255697c739c00ee52b05466be':
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
3 years ago
kerry
2ce997a6b8
代码修改
3 years ago
kerry
15e6d0f197
代码调整
3 years ago
kerry
64c05a49cd
Pull request #5477 : REPORT-51919 - 主题切换
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '3037528843f8a3b80563bf5295713d5b467c529f':
REPORT-51919 - 主题切换
3 years ago
Bjorn
c69a9da571
Pull request #5476 : CHART-20117 主题配色界面图表部分预览
...
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '3d604e95cd058c5935619173669075278e373797':
处理frm下的新建图表的主题
CHART-20117 主题配色界面图表部分预览
3 years ago
hades
f97a0bf718
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
3 years ago
kerry
3037528843
REPORT-51919 - 主题切换
3 years ago
白岳
3d604e95cd
处理frm下的新建图表的主题
3 years ago
白岳
cd765589c6
CHART-20117 主题配色界面图表部分预览
3 years ago
Hades
159b3eaec6
Pull request #5465 : REPORT-56047 设计器11.0适配内容处理
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'f02d2387592cbf6010681a8b84db6ea1343d1d87':
无jira 回退调试信息
REPORT-56047 设计器11.0适配内容处理
3 years ago
starryi
2de1f9fc04
Pull request #5466 : REPORT-51919 主题切换
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'f73a067bf83183e47b6424d2dd765b17b383fcb2':
REPORT-51919 主题切换
3 years ago
Bruce.Deng
fd3d33ece0
Pull request #5467 : REPORT-57431 & REPORT-57624 & REPORT-57609 & REPORT-57622 导出-导出事件相关问题
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit 'a60947aaf570ccd34b62cdd18091a4f214934266':
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑
3 years ago
superman
0a9abbe8e0
Merge pull request #5474 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e858de50ddafffd219ba42fa5411f5464d3758e2':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全
REPORT-57776 文件选择器替换-主jar里的类被删除后影响了其他插件
REPORT-57610 单元格没画出来
3 years ago
superman
e858de50dd
Merge pull request #5473 in DESIGN/design from release/10.0 to release/11.0
...
* commit 'a33d40660f5ab9a9b0853cb3e3ebe4c667cb79e0':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全
REPORT-57776 文件选择器替换-主jar里的类被删除后影响了其他插件
REPORT-57610 单元格没画出来
3 years ago
Bruce.Deng
a60947aaf5
Merge branch 'release/10.0' of https://code.fineres.com/scm/~bruce.deng/design into release/10.0
3 years ago
Bruce.Deng
36e9f88c1a
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
3 years ago
Starryi
f73a067bf8
REPORT-51919 主题切换
...
【问题原因】
新增模版主题功能
【改动思路】
同上
3 years ago
hades
f02d238759
无jira 回退调试信息
3 years ago
hades
651eaaccfa
REPORT-56047 设计器11.0适配内容处理
3 years ago
starryi
c3e0200cd6
Pull request #5462 : REPORT-51919 主题切换
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '9e499477c6a3b84936241f90db5eb27788cab3fd':
REPORT-51919 主题切换
3 years ago
Starryi
9e499477c6
REPORT-51919 主题切换
...
【问题原因】
新增模版主题功能
【改动思路】
同上
3 years ago
kerry
7e655b40ff
Pull request #5464 : REPORT-51919 绘制预览图
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'a9599d6dad8daa35d0541b1f002f7f52713a17e3':
REPORT-51919 绘制预览图
3 years ago
kerry
a9599d6dad
REPORT-51919 绘制预览图
3 years ago
Henry.Wang
a33d40660f
Pull request #5463 : REPORT-57776 文件选择器替换-主jar里的类被删除后影响了其他插件 && REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '193e07f62bf1f4d9cd95f1de3c3b16455f25ea78':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全
REPORT-57776 文件选择器替换-主jar里的类被删除后影响了其他插件
3 years ago
Henry.Wang
193e07f62b
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全
3 years ago
Henry.Wang
8c9c959a30
REPORT-57776 文件选择器替换-主jar里的类被删除后影响了其他插件
3 years ago
starryi
9561fff6c6
Pull request #5448 : REPORT-51919 主题切换
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '7249227b0afea298be29eb4ad901c6752c93e865':
REPORT-51919 主题切换
3 years ago