hades
851dec0a40
Merge branch 'final/10.0' of https://code.fineres.com/scm/~hades/design into final/10.0
4 years ago
hades
5fb883b5a2
REPORT-50788 删除数据集更新缓存
4 years ago
hades
510f592dba
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hades/design into bugfix/10.0
4 years ago
hades
82fa6142d1
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
4 years ago
starryi
4093ff15d2
Pull request #3900 : REPORT-50664 【移动端】body设置绝对布局,组件设置侧边导航后,还能设置组件冻结,为bug
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit '316c1eaecf02b1ba5d7fc8120fd8b1379f5ad927':
REPORT-50664 【移动端】body设置绝对布局,组件设置侧边导航后,还能设置组件冻结,为bug
4 years ago
superman
49a1db9a79
Merge pull request #3913 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '61bd80c8b011adbe568772fb7e05417a582cb70a':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
CHART-18772 frm下初始化需要选中gisButton
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
superman
61bd80c8b0
Merge pull request #3912 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'dc90fc88da3ccd3e98b458edb8abacb50e8dee2f':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
CHART-18772 frm下初始化需要选中gisButton
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
superman
dc90fc88da
Merge pull request #3911 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'f23a823916bd5f4449ececd8d754539a103f56c2':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
CHART-18772 frm下初始化需要选中gisButton
4 years ago
Kara
f23a823916
Pull request #3909 : REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'e2cc87e26d6daf38ca5d2d29a04e9809e6e848c7':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
4 years ago
hades
e2cc87e26d
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
4 years ago
Kara
e721c47d9e
Pull request #3908 : CHART-18772 frm下初始化需要选中gisButton
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit 'e70787b8c48e6037ac390b77d09b3b6ef19eb0d4':
CHART-18772 frm下初始化需要选中gisButton
4 years ago
白岳
e70787b8c4
CHART-18772 frm下初始化需要选中gisButton
4 years ago
Hades
8746ba08fb
Pull request #3907 : REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'cc5c4753c9fc73d916ba182007e1fff75873f769':
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
hades
cc5c4753c9
REPORT-50096 fix 预防npe
4 years ago
hades
c0d6f5f36a
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hades/design into bugfix/10.0
4 years ago
hades
33d55e89c8
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
Starryi
316c1eaecf
REPORT-50664 【移动端】body设置绝对布局,组件设置侧边导航后,还能设置组件冻结,为bug
...
【问题原因】
表单绝对布局下的组件结构和自适应布局下的组件结构不同,导致不能获取到body下的直接子组件名称,
从而无法获取启用了快速定位导航的组件,在移动端冻结设置面板看来就像是当前表单没有任何组件启用了
快速定位导航,所以没能在冻结组件列表中将相关组件排除出去.
【改动思路】
根据表单绝对布局的组件结构进行特殊处理,以获取Body布局组件.
4 years ago
superman
cb4ec40330
Merge pull request #3897 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'f9c32b26adf14780ff75790396b4911a12987ada':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
superman
f9c32b26ad
Merge pull request #3896 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '09e3cd545029b6858685f11380b41811cdd5f3cf':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
superman
09e3cd5450
Merge pull request #3895 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'f141bf91c14468ce8e2f0ed9ded61b81a79fd27a':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
Kara
f141bf91c1
Pull request #3886 : REPORT-50662 设计器运行一段时间后会卡死
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'b5dee97f77a922bbb5f709712a2c753101438367':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
superman
7dc5bbf172
Merge pull request #3891 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '6fef7052ad7de2e49a12e9d0e5f9d32f2a977c66':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
superman
6fef7052ad
Merge pull request #3890 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '440555fa0caaf4f045fa0c12a68c27ecff3793cd':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
superman
440555fa0c
Merge pull request #3889 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '8ca9e09f23028b1aecd2cc925583ff5898284c0a':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
superman
8ca9e09f23
Merge pull request #3888 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd237ce615b5ad9d7511dd0684fe79b9a047ac2b0':
4 years ago
superman
d237ce615b
Merge pull request #3887 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'c6f801adb09fab6222ed610a289ad6aac565784b': (39 commits)
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
REPORT-50184 首次添加数据集参数 参数面板无显示
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候,图标名称写错了,导致没识别出来 【改动思路】修改图标名称
CHART-18080 变量名更换
CHART-18619 gis国际化默认值修改
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
CHART-18348 调整富文本组件尺寸
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
无JIRA任务 上传下因代码冲突被删除的svg图标
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
CHART-18080 修复数字输入框输入中文时自动删除数字问题
REPORT-45944 ui调整
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
REPORT-45944 日文版模板重命名弹窗显示不全
...
4 years ago
hades
b5dee97f77
REPORT-50662 fix ;
4 years ago
hades
01740e564e
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
Hades
0312a3ca60
Pull request #3864 : REPORT-49034 引用JS静态资源文件路径出错
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '0a3dddb5ba19c998dbd42b8e28a791f12d1bfe2f':
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
Kara
c6f801adb0
Pull request #3885 : CHART-18720 release→final
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '62715b46dbe3825bcbd2a577c80ced66de4d4957':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
白岳
62715b46db
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
Bjorn
99b48768f3
Pull request #3884 : CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'd683e6aa5c297746d6b08a26466eda2bad90043d':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
白岳
d683e6aa5c
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
superman
90fe71057b
Merge pull request #3868 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'b711ef770c58ec504897f214110ae50c65adf8df':
REPORT-50184 首次添加数据集参数 参数面板无显示
4 years ago
superman
b711ef770c
Merge pull request #3867 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'c2756e32ad19f3220a5d96f9cb43578d155700aa':
REPORT-50184 首次添加数据集参数 参数面板无显示
4 years ago
superman
c2756e32ad
Merge pull request #3866 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'aace012b28ba740deef71bf7b1d255a4071a1565':
REPORT-50184 首次添加数据集参数 参数面板无显示
4 years ago
hades
0a3dddb5ba
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
4 years ago
hades
8da53d0d6f
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
Kara
aace012b28
Pull request #3863 : REPORT-50184 首次添加数据集参数 参数面板无显示
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '72d3275ea448f269cd2a2703d334bc72f70b69c1':
REPORT-50184 首次添加数据集参数 参数面板无显示
4 years ago
hades
72d3275ea4
REPORT-50184 首次添加数据集参数 参数面板无显示
4 years ago
superman
6ee30f156d
Merge pull request #3860 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '89c9bb222bdb66dd6fd5e7d503420540f0dd9807':
4 years ago
superman
89c9bb222b
Merge pull request #3859 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '8d55f79fa2d23d623e37c2ae8c8acdf36683eee0':
4 years ago
superman
8d55f79fa2
Merge pull request #3858 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '5bf0d5d0ed78bfedbae43b12ed32820f80c3acef':
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候,图标名称写错了,导致没识别出来 【改动思路】修改图标名称
CHART-18080 变量名更换
CHART-18619 gis国际化默认值修改
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
CHART-18348 调整富文本组件尺寸
无JIRA任务 上传下因代码冲突被删除的svg图标
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
CHART-18080 修复数字输入框输入中文时自动删除数字问题
REPORT-45944 ui调整
4 years ago
superman
5bf0d5d0ed
Merge pull request #3856 in DESIGN/design from release/10.0 to final/10.0
...
* commit '48553273c9f97c5e9a48dfa25a56826dfb8d75d5': (37 commits)
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候,图标名称写错了,导致没识别出来 【改动思路】修改图标名称
CHART-18080 变量名更换
CHART-18619 gis国际化默认值修改
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
CHART-18348 调整富文本组件尺寸
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
无JIRA任务 上传下因代码冲突被删除的svg图标
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
CHART-18080 修复数字输入框输入中文时自动删除数字问题
REPORT-45944 ui调整
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
REPORT-45944 日文版模板重命名弹窗显示不全
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
...
4 years ago
superman
c1800decce
Merge pull request #3853 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '48553273c9f97c5e9a48dfa25a56826dfb8d75d5':
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
4 years ago
Hades
48553273c9
Pull request #3849 : REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '698eac4dc9a8f9a15bf116e11af5516ab9b1b95f':
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
4 years ago
hades
698eac4dc9
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
4 years ago
ju|剧浩宇
f09f3f8cff
Pull request #3834 : 无jira任务 解决冲突
...
Merge in DESIGN/design from ~YVAN/design:feature/10.0 to feature/10.0
* commit 'adbdcdc895e37b5ae9aaf8698d60d803f4137a51':
无jira任务,处理冲突
REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候,图标名称写错了,导致没识别出来 【改动思路】修改图标名称
CHART-18080 变量名更换
CHART-18080 修复数字输入框输入中文时自动删除数字问题
4 years ago
Yvan
adbdcdc895
Merge branch 'release/10.0' of https://code.fineres.com/scm/~yvan/design into feature/10.0
4 years ago
Yvan
bc700703fc
无jira任务,处理冲突
4 years ago