superman
b034846a69
Merge pull request #3820 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'c55411f92435a3a38028aa4ae4799e5057d352e3':
CHART-18619 gis国际化默认值修改
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
CHART-18348 调整富文本组件尺寸
4 years ago
starryi
c55411f924
Pull request #3803 : REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit '6ce46d57e2132851d49dec173c26bdfdbbf58450':
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
4 years ago
Qinghui.Liu
627a65a811
Pull request #3801 : CHART-18348 调整富文本组件尺寸
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '7c4c873078a48f9e0cf2afe3679e86d7260e669a':
CHART-18348 调整富文本组件尺寸
4 years ago
ju|剧浩宇
868ea3009b
Pull request #3810 : CHART-18619 gis国际化默认值修改
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '013a6396f7311a0d770254d4d4f48eadcd3bb46f':
CHART-18619 gis国际化默认值修改
4 years ago
白岳
013a6396f7
CHART-18619 gis国际化默认值修改
4 years ago
superman
88402de15f
Merge pull request #3807 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'f1e2cd4f5d42ceacd81ba74a3132160be5b55946':
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
4 years ago
superman
f1e2cd4f5d
Merge pull request #3806 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'd0243225fe3f9258dc676e903d8ced45539885b1':
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
4 years ago
superman
d0243225fe
Merge pull request #3805 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '46b02eb8fd6ab7ad28e279f4f3df376b271871d5':
4 years ago
superman
46b02eb8fd
Merge pull request #3804 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '21dc4f8ca2dbd82c62bd326f85e940a8ff5bcbe1':
4 years ago
Starryi
6ce46d57e2
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
...
【问题原因】
选中表格中区域后,设置边框颜色为黑色,勾选右侧外边框,表格中选中区域的
单元格都出现右边框,正确的效果是只有选中区域右侧的单元格有右边框。
目前代码中更新单元格边框的逻辑是
1. 首先将边框面板的单元格样式直接写入每个单元格中(此时单元格边样式对象值是不对的,需要进行修正)
2. 根据选中区域的单元格样式(旧样式)和边框面板中的样式(新样式)进行比较
3. 决定指定单元格边框是否使用新样式
问题出现在:
1. 无法获取当前选中区域的单元格样式(旧样式),因为已经被污染了.
2. 获取到的边框面板样式不对,导致比较结果出错
3. 只在单元格边框使用新样式时,才重写单元格边框样式对象,不使用新样式时,会继续使用被污染的值.
问题
【改动思路】
1. 在更新边框前,获取选中区域的单元格样式
2. 修改边框面板样式对象的创建逻辑
3. 不使用新样式时,重写单元格边框为旧样式
4 years ago
Qinghui.Liu
7c4c873078
CHART-18348 调整富文本组件尺寸
4 years ago
ju|剧浩宇
186c45dade
Pull request #3800 : KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
...
Merge in DESIGN/design from ~VITO/c-design:KERNEL-6368 to bugfix/10.0
* commit 'be0850e46a6bd224fade40fed6f5ba853f9e8093':
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
4 years ago
vito
be0850e46a
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
4 years ago
superman
21dc4f8ca2
Merge pull request #3799 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'e75f2c4e6326c49c1b2a956d230a76e29b8e4cdd':
REPORT-49782 补充因代码冲突删去的SVG图标 【问题原因】补充因代码冲突删去的SVG图标 【改动思路】补充因代码冲突删去的SVG图标
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
REPORT-46723 填报智能添加单元格组
CHART-18429 点类地图散点条件属性默认值
4 years ago
Yvan
20813c2ed9
Pull request #3760 : 无jira任务 解决冲突
...
Merge in DESIGN/design from ~YVAN/design:feature/10.0 to feature/10.0
* commit '5d13456fc8e407bb5a728e4d3d51a44fed217b10':
REPORT-49782 补充因代码冲突删去的SVG图标 【问题原因】补充因代码冲突删去的SVG图标 【改动思路】补充因代码冲突删去的SVG图标
无JIRA任务 上传下因代码冲突被删除的svg图标
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
REPORT-46723 填报智能添加单元格组
CHART-18429 点类地图散点条件属性默认值
REPORT-45944 ui调整
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Yvan
5d13456fc8
无jira任务,处理冲突
4 years ago
superman
99fd3eebd2
Merge pull request #3758 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'f62572a2bdc76cd416b93e7f1fdf8b265e7fc72b':
REPORT-49782 补充因代码冲突删去的SVG图标 【问题原因】补充因代码冲突删去的SVG图标 【改动思路】补充因代码冲突删去的SVG图标
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
REPORT-46723 填报智能添加单元格组
CHART-18429 点类地图散点条件属性默认值
4 years ago
superman
f62572a2bd
Merge pull request #3757 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'e75f2c4e6326c49c1b2a956d230a76e29b8e4cdd':
REPORT-49782 补充因代码冲突删去的SVG图标 【问题原因】补充因代码冲突删去的SVG图标 【改动思路】补充因代码冲突删去的SVG图标
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
REPORT-46723 填报智能添加单元格组
CHART-18429 点类地图散点条件属性默认值
4 years ago
Kara
e75f2c4e63
Pull request #3752 : REPORT-49782 补充因代码冲突删去的SVG图标
...
Merge in DESIGN/design from ~YVAN/design:final/10.0 to final/10.0
* commit '0f6fa281b8d02e55692b598138506e4f336f6be4':
REPORT-49782 补充因代码冲突删去的SVG图标 【问题原因】补充因代码冲突删去的SVG图标 【改动思路】补充因代码冲突删去的SVG图标
4 years ago
superman
6c6978399b
Merge pull request #3753 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '480c9ecadf43db167d6ebd5f1aee671eb42fa455':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Yvan
0f6fa281b8
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
4 years ago
Yvan
8f9914c8e3
REPORT-49782 补充因代码冲突删去的SVG图标
...
【问题原因】补充因代码冲突删去的SVG图标
【改动思路】补充因代码冲突删去的SVG图标
4 years ago
Yvan
5abbd96853
Pull request #3751 : 无JIRA任务 上传下因代码冲突被删除的svg图标
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '46f30d661ff164210f1489e1e317494531eee308':
无JIRA任务 上传下因代码冲突被删除的svg图标
4 years ago
Yvan
46f30d661f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
8e2f877e49
无JIRA任务 上传下因代码冲突被删除的svg图标
4 years ago
Kara
c0a2b1d900
Pull request #3750 : REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/10.0 to final/10.0
* commit 'f21411bce770bde0111b67dbf343d8edcb16e233':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
4 years ago
lucian
f21411bce7
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
4 years ago
Hades
a7cabd6eaf
Pull request #3749 : REPORT-48965 出现concurrentModification异常
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6daaa9f4f9b0bd2ea5f0a4d67b62660895bb5c6c':
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
4 years ago
Kara
c662188cdc
Pull request #3748 : REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit 'c02afbf2bc35660f134af2cd5e81e1693197a7ba':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
hades
6daaa9f4f9
REPORT-48965 使用批量添加 减少容器复制次数
4 years ago
hades
f462925487
REPORT-48965 出现concurrentModification异常
4 years ago
kerry
c02afbf2bc
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Kara
668b010c55
Pull request #3746 : REPORT-46723 填报智能添加单元格组
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '83afc03993bac1684ac9074b66b4c7408f9c5012':
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
REPORT-46723 填报智能添加单元格组
4 years ago
hades
83afc03993
REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
4 years ago
hades
16022931c8
REPORT-46723 填报智能添加单元格组
4 years ago
kuangshuai
8f1a16b7c8
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~tommy/design into release/10.0
4 years ago
kuangshuai
434f4a0f56
CHART-18080 修复数字输入框输入中文时自动删除数字问题
4 years ago
Kara
23731cb9b7
Pull request #3745 : CHART-18429 点类地图散点条件属性默认值
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '03c166ada40d9c713370ae81b99d6f8254a71ab8':
CHART-18429 点类地图散点条件属性默认值
4 years ago
kerry
480c9ecadf
Pull request #3739 : REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
...
Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit '91923d2a67474afe06355ecf36f997d0f693548f':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
白岳
03c166ada4
CHART-18429 点类地图散点条件属性默认值
4 years ago
kerry
48adff3f2d
Pull request #3744 : REPORT-45944 ui调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'a6c3b13be06efdb7c06fd6b5ccd090b1e2e2dd62':
REPORT-45944 ui调整
4 years ago
superman
e277506e27
Merge pull request #3743 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '3d783a93155c7b81b47d9818e00773db750ead07':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
4 years ago
kerry
a6c3b13be0
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/10.0
4 years ago
kerry
ad8e082c39
REPORT-45944 ui调整
4 years ago
superman
3d783a9315
Merge pull request #3742 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6d86eb162d869e90d18f41e19660068b8ff84fbd':
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
4 years ago
superman
6d86eb162d
Merge pull request #3741 in DESIGN/design from final/10.0 to release/10.0
...
* commit '934568a138c45e8d82395b5cd7c3cfb0336b382a':
4 years ago
superman
934568a138
Merge pull request #3740 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '05012c185433934fe4d4429875fbaf05e1b29038':
4 years ago
kerry
91923d2a67
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
superman
86a3608f18
Merge pull request #3738 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '4d62bbf253d9ab3076d39a74702e105baa199e01':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Lucian.Chen
4d62bbf253
Pull request #3737 : REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit 'be9992d61cf6f225b9d159377851b974f32b3583':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
4 years ago