hades
0180da8280
REPORT-70456 日志输出下url
3 years ago
hades
5971e699ef
REPORT-70456 无封面图的运营文档获取报错
3 years ago
Hades
642dee1ad9
Pull request #8682 : REPORT-70475 新旧fm切换 悬浮按钮丢失 && REPORT-70463 搜索框键入文本后界面闪烁
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '4313157f8fb11d689f72d054a1479e616fdee063':
REPORT-70463 搜索框键入文本后界面闪烁
REPORT-70475 新旧fm切换 悬浮按钮丢失
3 years ago
hades
4313157f8f
REPORT-70463 搜索框键入文本后界面闪烁
3 years ago
hades
1f4f119345
Merge branch 'feature/x' of https://code.fineres.com/scm/~hades/design into feature/x
3 years ago
hades
282242695a
REPORT-70475 新旧fm切换 悬浮按钮丢失
3 years ago
Hades
17dd9d74bb
Pull request #8680 : REPORT-70206 处理异常情况 手动删除prop设计器启动失败
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '4bccb3288537ed74cc5f21082a78c6ecffc1a003':
REPORT-70206 删除无用import
REPORT-70206 处理异常情况 手动删除prop设计器启动失败
3 years ago
hades
4bccb32885
REPORT-70206 删除无用import
3 years ago
hades
8fea3f3218
REPORT-70206 处理异常情况 手动删除prop设计器启动失败
3 years ago
Hades
34c5592826
Pull request #8679 : REPORT-67417 运营产品v1.0 补充一些内容
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '6b3f2f46f58a2fb0360f0569f72e3200025da2b8':
REPORT-67417 运营产品v1.0 补充一些内容
3 years ago
hades
6b3f2f46f5
REPORT-67417 运营产品v1.0 补充一些内容
3 years ago
superman
f706094c2d
Merge pull request #8678 in DESIGN/design from release/11.0 to feature/x
...
* commit '0ead804fd83a824c87ccdfb888978c3df23caeb9':
3 years ago
superman
0ead804fd8
Merge pull request #8677 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'd38b24450a99d5fa99684938463b6631678ada4f':
3 years ago
ju
925cb37c21
Pull request #8669 : REPORT-68363 条件属性系列间值的比较
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit 'a6238d0f61454d40b9affbcbe2794ff4fe052e72':
REPORT-68363 条件属性系列间值的比较
REPORT-68363 条件属性系列间值的比较
3 years ago
pengda
a6238d0f61
REPORT-68363 条件属性系列间值的比较
3 years ago
pengda
7926bcf413
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
714994940d
REPORT-68363 条件属性系列间值的比较
3 years ago
superman
d38b24450a
Merge pull request #8668 in DESIGN/design from release/11.0 to final/11.0
...
* commit '17bfa59afdaafc62287b47fce13ea98860f50a18':
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
update
REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
REPORT-69776 切换在线组件的排序,会加载很久
REPORT-68638 design fix:没有配色的时候渲染和配置界面配色不一致,统一成配置界面的
REPORT-68357 fix:namestyle导致fvs.cpt中单元格样式中有主题相关配置
REPORT-69575 设计器在线组件刷不出来
3 years ago
Hades
a0ecf11a4f
Pull request #8656 : REPORT-67417 运营产品v1.0
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '936249f207dad39ea376f5feae0ddd1d72232c12':
REPORT-67417 运营产品v1.0 add漏交类
REPORT-67417 运营产品v1.0
3 years ago
hades
936249f207
REPORT-67417 运营产品v1.0 add漏交类
3 years ago
hades
a1cb79707e
REPORT-67417 运营产品v1.0
3 years ago
Hades
23a995afe0
Pull request #8625 : REPORT-70092 重定向报错,帮助文档跳转异常
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'c387c9909fc15f6ff12bc88d5f3c977c2bad01e3':
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
vito
29d82f109c
Pull request #8645 : KERNEL-10665 图片导出优化
...
Merge in DESIGN/design from ~VITO/c-design:feature/x to feature/x
* commit '1b1a2e88965fb517aeebdec0c4eaf1ae7ee21a4e':
KERNEL-10665 图片导出优化
3 years ago
vito
1b1a2e8896
KERNEL-10665 图片导出优化
3 years ago
vito
150b050a3e
Pull request #8635 : KERNEL-10665 图片导出优化
...
Merge in DESIGN/design from ~VITO/c-design:feature/x to feature/x
* commit 'fd32268176d2c78b6b24fbfa9eeead2ce4d55625':
KERNEL-10665 图片导出优化
3 years ago
vito
fd32268176
KERNEL-10665 图片导出优化
3 years ago
hades
c387c9909f
REPORT-70092 重定向报错,帮助文档跳转异常
3 years ago
Yuan.Wang
38f70ece22
Pull request #8606 : REPORT-68346 常用参数组合支持触发联动与事件
...
Merge in DESIGN/design from ~YUAN.WANG/design:feature/x to feature/x
* commit '52cd8e88d1b6efe316b7a89c532fc3251a7fb969':
REPORT-68346 常用参数组合支持触发联动与事件
3 years ago
superman
5984edb1f8
Merge pull request #8615 in DESIGN/design from release/11.0 to feature/x
...
* commit '17bfa59afdaafc62287b47fce13ea98860f50a18':
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-69842 修改边框颜色单元格背景颜色会变统一
update
REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
3 years ago
superman
17bfa59afd
Merge pull request #8614 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'f27a22348ef02b09c5143566828bfffb8ed9ab1a':
REPORT-69842 修改边框颜色单元格背景颜色会变统一
3 years ago
Lucian.Chen
a270c81dfc
Pull request #8604 : REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时,前端显示不对
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/x to feature/x
* commit 'b99e8ac96520e6e53ca09d02990a14edd924952e':
REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时,前端显示不对
3 years ago
Lucian.Chen
2993e30721
Pull request #8603 : REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/11.0 to release/11.0
* commit '7baae38c8582d1953805bb3a97e733ff86a28eb4':
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
3 years ago
Yuan.Wang
52cd8e88d1
REPORT-68346 常用参数组合支持触发联动与事件
3 years ago
lucian
b99e8ac965
REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时,前端显示不对
3 years ago
starryi
f27a22348e
Pull request #8574 : REPORT-69842 修改边框颜色单元格背景颜色会变统一
...
Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0
* commit '2534fffebd90bef2533416b2aaece153fd2355af':
REPORT-69842 修改边框颜色单元格背景颜色会变统一
3 years ago
ju
624c27c3eb
Pull request #8573 : REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '4a7146db1fdc5411b1aceb8f682875df408ba232':
update
REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
3 years ago
lucian
7baae38c85
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
3 years ago
lucian
cf19dcee7a
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
3 years ago
lucian
7bd8d5b613
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
3 years ago
superman
32da067abb
Merge pull request #8584 in DESIGN/design from release/11.0 to feature/x
...
* commit '6575585922a71aa326a896ffcc2695ab6c810f81':
3 years ago
superman
6575585922
Merge pull request #8583 in DESIGN/design from final/11.0 to release/11.0
...
* commit '70b31e02d337f0bdfa472d4a5977e91c39d9d5d1':
3 years ago
superman
70b31e02d3
Merge pull request #8582 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8c69f68a9ffcfdcd106a30fe9151ac751e63c396':
3 years ago
superman
8c69f68a9f
Merge pull request #8575 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '9caad83fa41e3b6390ee73f277928e7e542604fa':
3 years ago
Starryi
2534fffebd
REPORT-69842 修改边框颜色单元格背景颜色会变统一
...
【问题原因】
错误的逻辑是
使用单元格样式面板的updateBean方法,获取单元格样式面板的所有配置,并将其设置
到指定单元格上。这个逻辑会导致在选中多个单元格时,用户没有修改的样式配置项也
被覆盖掉.(单元格样式面板的配置项并不可靠,在某些情况下比如单元格多选时,不能
反应实际的单元格样式)
正确的逻辑
用户在编辑自定义单元格样式时,仅修改发生了更改的配置,其余保持不变,也就是将原
有的单元格样式配置,与用户修改的部分配置进行merge,得到新的样式,并设置到指定
单元格上。
注意:这里的样式配置更改存在的情况有三种:
1. 单于昂样式跟随主题切换到自定义样式。样式细节未发生变动,但不再跟随主题了,代码逻辑中对应
switchCellStylesToCustom,样式对象类型从NameStyle变为Style
2. 在跟随主题样式面板,切换主题单元格样式。全量更新,放弃单元格所有原来样式,因此需要使用updateBean.
3. 在自定义样式面板,修改部分配置项。增量更新,保持其他配置项不变,因此需要使用mergeBean.
【改动思路】
同上
【review建议】
3 years ago
shine
4a7146db1f
update
3 years ago
shine
75fe3039de
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
3 years ago
shine
833c4b5872
REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
3 years ago
superman
2e382eb9bc
Merge pull request #8572 in DESIGN/design from release/11.0 to feature/x
...
* commit '4171b54b27c0caef3f369c71e97f4311f212abbe':
REPORT-69776 切换在线组件的排序,会加载很久
REPORT-69575 设计器在线组件刷不出来
REPORT-69776 切换在线组件的排序,会加载很久
3 years ago
superman
4171b54b27
Merge pull request #8571 in DESIGN/design from final/11.0 to release/11.0
...
* commit '9caad83fa41e3b6390ee73f277928e7e542604fa':
REPORT-69776 切换在线组件的排序,会加载很久
REPORT-69575 设计器在线组件刷不出来
3 years ago
superman
9caad83fa4
Merge pull request #8570 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'ddeda7db01ae80f6a326e1027aa1b499200393b3':
3 years ago