shine
8638c51f4c
update
3 years ago
shine
2983ac90bb
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
539dd8ca4c
CHART-22090 条件属性-颜色控件残留
3 years ago
lucian
1a20de07f0
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0
3 years ago
superman
4805c8a0c2
Merge pull request #7197 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1b0ae7b6eed937d07f7be3d7ac2bbf5dde6c795e':
无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
lucian
3e25450132
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0
3 years ago
vito
e103647723
无jira任务 单元测试打包
3 years ago
superman
b61de82e05
Merge pull request #7158 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '95b3ef73f1fd4aac4038069ae42be7e3ac6bc7b6':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
95b3ef73f1
Merge pull request #7157 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ca27d54e842035e119aa44983dd9b795fa6347e4':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
ca27d54e84
Merge pull request #7156 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '656b3fcbbdfdb60d5ab672b225628d980fa8c9b4':
3 years ago
Tommy
99056db189
Pull request #7139 : REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
...
Merge in DESIGN/design from ~TOMMY/design:final/10.0 to final/10.0
* commit '4f62f88149dace31c3bf6fd84cd2fcd714217979':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
656b3fcbbd
Merge pull request #7150 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'b56616d07893e15ae0cd8b0d47d6c41af7bff6fd':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
REPORT-64013 社区url修正(添加锚点标致)
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
Tommy
4f62f88149
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
57f997fcbc
Merge pull request #7108 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e20b93f7b50457093a62625607543eb9c49d3729':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
superman
e20b93f7b5
Merge pull request #7107 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'b56616d07893e15ae0cd8b0d47d6c41af7bff6fd':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
zheng
b56616d078
Pull request #7102 : CHART-22213 cherry pick to final10.0 fix:新增警戒线 默认应该是9px12px 不是9px
...
Merge in DESIGN/design from ~ZHENG/c-design:final/10.0 to final/10.0
* commit '6c57ae3713ab5b5bb8c807d6b5e33adcb29b7988':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
shine
6c57ae3713
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
Hades
8a015c7039
Pull request #7099 : REPORT-64095 websocket频繁出现断开又连上问题
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c6677e6906cb0f518aa8d76e56fb18e196a88928':
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
hades
c6677e6906
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
superman
94638c4c7f
Merge pull request #7084 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fa22a67573a4c692b848525ec11167a43138c4ef':
REPORT-64013 社区url修正(添加锚点标致)
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
fa22a67573
Merge pull request #7083 in DESIGN/design from final/10.0 to release/10.0
...
* commit '5253726980101f35b1953c592db97d13fdff3fca':
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
fanglei
5253726980
Pull request #7078 : REPORT-64013 社区url修正(添加锚点标致)
...
Merge in DESIGN/design from ~FANGLEI/design:final/10.0 to final/10.0
* commit 'e981ca8eb1d9c0896988891da0bd7a26253a2475':
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
方磊
e981ca8eb1
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
zheng
dd6d55e32b
Pull request #7065 : CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '8c767ba1c6a28b78a94e28ec7f49c68c6dfd1d81':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
Tommy
dd10d3f57f
Pull request #7059 : REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'b28939592ea72e48680d9abcb4509da2d94ac8b4':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
9887725d41
Merge pull request #7076 in DESIGN/design from release/10.0 to final/10.0
...
* commit '20970382920669c62ac950e8140be5ed1882069d':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
2097038292
Merge pull request #7074 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '656a9d1930552eadd5f90bc0e8aac1d92bf80a7d':
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
shine
8c767ba1c6
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
b927d0263d
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
superman
656a9d1930
Merge pull request #7063 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
Tommy
b28939592e
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
fanglei
39cd7f0434
Pull request #7056 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '123b0ce7e144e9952abf6aac425c657f9fafc70e':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
方磊
123b0ce7e1
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
superman
7a37840f23
Merge pull request #7048 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
fanglei
861c84c4ae
Pull request #7032 : REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'a0798b48218e0f93de6a42859ff3504c4e22d5ce':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
superman
7439a1d4d8
Merge pull request #7036 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '13f832ef783feff089e210601d6bc2be4f3a38bc':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
方磊
a0798b4821
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
fanglei
13f832ef78
Pull request #7029 : REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'ca2fcb358e038e9564ac0f5edc6aad48c554316d':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
方磊
ca2fcb358e
REPORT-63092 漏传了import语句
3 years ago
方磊
72b7bdacae
REPORT-63499
3 years ago
方磊
c19bb8edeb
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
zheng
11bdd55efc
Pull request #7027 : CHART-21584 feat:fvs.chart.font 单位px 范围6-200
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'adf49bfded20a12f7fc261119314b1fc582069f4':
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
shine
adf49bfded
update
3 years ago
shine
043a81042d
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
a74ef15eb8
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
starryi
4396805594
Pull request #6990 : REPORT-56014 & REPORT-56015 & REPORT-60161
...
Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0
* commit '84b3103890b1620c393be4657a8ca9720301f800':
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
3 years ago
superman
52925ffe09
Merge pull request #7009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '925f5058768a450212da7fd55df7689002f2c67f':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
925f505876
Merge pull request #7008 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'dc6b99807e495492062639ce007cc6c831616798':
3 years ago
superman
dc6b99807e
Merge pull request #7007 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'c60528cff2e0ecb91224714bc407efce7792437d':
3 years ago