hades
47fe63a2fb
无jira 解决冲突
3 years ago
superman
32532126ce
Merge pull request #8830 in DESIGN/design from final/11.0 to release/11.0
...
* commit '39c1ca8b086218e50a8c1d60ca7868ed37f73997':
3 years ago
superman
39c1ca8b08
Merge pull request #8829 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'a15a59a3a463ab861eeccc68c7898fd9aeb9a07a':
3 years ago
pengda
ef6d7a45a3
Pull request #8822 : REPORT-70426 条件属性支持汇总数组-交互界面问题
...
Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0
* commit '0da69cc600d2b8aea42b225e86fe415d760fba0a':
REPORT-70426 条件属性支持汇总数组-交互界面问题
3 years ago
pengda
0da69cc600
REPORT-70426 条件属性支持汇总数组-交互界面问题
3 years ago
superman
a15a59a3a4
Merge pull request #8821 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'fa6ad80cbb859c5f3c216ec81d5db5c45422f951':
3 years ago
Hades
8d27826b4a
Pull request #8810 : REPORT-70446 交互视觉修改 同步release11.0 && REPORT-70387 次管远程连接,会看到特定的没有权限的数据连接
...
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit '5e3cf961e56c1ba3275668dff59f68942bbb38fe':
REPORT-70446 添加工具方法
REPORT-70446 交互视觉修改 svg图片绘制问题
REPORT-70387 次管远程连接,会看到特定的没有权限的数据连接
REPORT-70446 交互视觉修改
3 years ago
Hades
85f0df8a2e
Pull request #8808 : REPORT-70446 交互视觉修改
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '2d0a212718a23e9e393a0e6bbac3ffc7e69c78e0':
REPORT-70446 交互视觉修改
3 years ago
hades
5e3cf961e5
REPORT-70446 添加工具方法
3 years ago
hades
f2bdb74713
REPORT-70446 交互视觉修改 svg图片绘制问题
3 years ago
superman
f416021dbe
Merge pull request #8819 in DESIGN/design from release/11.0 to feature/x
...
* commit '89c2c75533b1508a8d20ee1460fec3162a395940':
3 years ago
hades
5f8806250a
REPORT-70387 次管远程连接,会看到特定的没有权限的数据连接
3 years ago
hades
d657b5d8bd
REPORT-70446 交互视觉修改
3 years ago
superman
89c2c75533
Merge pull request #8807 in DESIGN/design from feature/x to release/11.0
...
* commit 'b63fb16eebd043c173d2637183ae98b705ddda8f': (43 commits)
REPORT-70665 11.0.3.1设计器 换最新feature包无法启动
REPORT-69470 多分类坐标轴分层显示,选择部分轴标签颜色弹窗自动关闭
REPORT-70446 交互效果
REPORT-70472 alphafine中打开插件管理,弹窗的层级不正确
REPORT-70682 cid设置推送隐藏时 悬浮按钮还是有新增文章标记提示
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
REPORT-70483 cid配置第二天推送,但是alphafine即刻就可以收到推送
REPORT-70452 alphafine搜索后,切换tab,文档tab下的状态不正确 && REPORT-70446 面板交互视觉问题
REPORT-65492 增加千分比格式
KERNEL-11019 云端运维插件对主 jar 启动速度影响的优化
REPORT-70472 alphafine中打开插件管理,弹窗的层级不正确
REPORT-70458 补上颜色常量
REPORT-70449 alphafine面板缩小后,悬浮按钮显示问题
REPORT-70458 tab的悬浮状态不正确
REPORT-70456 日志输出下url
REPORT-70456 无封面图的运营文档获取报错
REPORT-70463 搜索框键入文本后界面闪烁
REPORT-70475 新旧fm切换 悬浮按钮丢失
REPORT-65492 新增公式
...
3 years ago
hades
2d0a212718
REPORT-70446 交互视觉修改
3 years ago
Hades
b63fb16eeb
Pull request #8796 : REPORT-70665 11.0.3.1设计器 换最新feature包无法启动
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'a65eb1aa996137ebfb1730da50f6f6abd2cdda70':
REPORT-70665 11.0.3.1设计器 换最新feature包无法启动
3 years ago
hades
a65eb1aa99
REPORT-70665 11.0.3.1设计器 换最新feature包无法启动
3 years ago
fanglei
04e8f8eb71
Pull request #8806 : REPORT-69470 多分类坐标轴分层显示,选择部分轴标签颜色弹窗自动关闭
...
Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x
* commit '9af7ee1f8148f887a2b2d722cda1163649cc590e':
REPORT-69470 多分类坐标轴分层显示,选择部分轴标签颜色弹窗自动关闭
3 years ago
方磊
9af7ee1f81
REPORT-69470 多分类坐标轴分层显示,选择部分轴标签颜色弹窗自动关闭
3 years ago
superman
70dd834718
Merge pull request #8805 in DESIGN/design from release/11.0 to feature/x
...
* commit 'ed5179243fae203170ad0907a59f31a5ec18ae00':
REPORT-69686 【公式】VALUE函数公式说明内容默认显示不全也无滚动条
3 years ago
Hades
ed5179243f
Pull request #8795 : REPORT-69686 【公式】VALUE函数公式说明内容默认显示不全也无滚动条
...
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit '3f0695b5b4f78c9f24003e5b7aded4ace7d98f57':
REPORT-69686 【公式】VALUE函数公式说明内容默认显示不全也无滚动条
3 years ago
Hades
6b0bc4f575
Pull request #8794 : REPORT-70446 交互效果
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '1e6ca906338431088e744f7a14baca4ce6452d73':
REPORT-70446 交互效果
3 years ago
hades
3f0695b5b4
REPORT-69686 【公式】VALUE函数公式说明内容默认显示不全也无滚动条
3 years ago
hades
1e6ca90633
REPORT-70446 交互效果
3 years ago
superman
ae771bc27b
Merge pull request #8757 in DESIGN/design from release/11.0 to feature/x
...
* commit '2b5625c6b52202c22d0f29b58be350ba9535b2ff':
REPORT-70504 线程池管理
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
3 years ago
superman
2b5625c6b5
Merge pull request #8756 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'fa6ad80cbb859c5f3c216ec81d5db5c45422f951':
3 years ago
superman
fa6ad80cbb
Merge pull request #8755 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'ff0e010cb3cefe59d967224751a893a12481eb60':
3 years ago
superman
ff0e010cb3
Merge pull request #8748 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '4a179a0f4f2c8a080c1afb7936bea7994e17514b':
3 years ago
Lucian.Chen
10dfbbf22b
Pull request #8736 : REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/11.0 to release/11.0
* commit 'c91aee4e861fa32cbf4a0c4460341b960e555db2':
REPORT-70504 线程池管理
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
3 years ago
Hades
8d38d56c20
Pull request #8738 : REPORT-70682 cid设置推送隐藏时 悬浮按钮还是有新增文章标记提示 && REPORT-70472 alphafine中打开插件管理,弹窗的层级不正确
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '9c10525ece18cfd5da017ded1ca04abc29331f9f':
REPORT-70472 alphafine中打开插件管理,弹窗的层级不正确
REPORT-70682 cid设置推送隐藏时 悬浮按钮还是有新增文章标记提示
3 years ago
hades
9c10525ece
REPORT-70472 alphafine中打开插件管理,弹窗的层级不正确
3 years ago
hades
ad7328e959
REPORT-70682 cid设置推送隐藏时 悬浮按钮还是有新增文章标记提示
3 years ago
Lanlan
19d9331fff
Pull request #8735 : KERNEL-10489 云端运维插件对主 jar 启动速度影响的优化
...
Merge in DESIGN/design from ~LANLAN/design:feature/x to feature/x
* commit 'af3e2752949ec380978ef20af762639fe4b79954':
KERNEL-11019 云端运维插件对主 jar 启动速度影响的优化
3 years ago
Hades
45800b77de
Pull request #8737 : REPORT-70452 alphafine搜索后,切换tab,文档tab下的状态不正确 && REPORT-70446 面板交互视觉问题 && REPORT-70483 cid配置第二天推送,但是alphafine即刻就可以收到推送
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'bc9e3a46d6e09f1b7634a8a03034d4408310f001':
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
REPORT-70483 cid配置第二天推送,但是alphafine即刻就可以收到推送
REPORT-70452 alphafine搜索后,切换tab,文档tab下的状态不正确 && REPORT-70446 面板交互视觉问题
3 years ago
lucian
c91aee4e86
REPORT-70504 线程池管理
3 years ago
hades
bc9e3a46d6
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
3 years ago
hades
a1d545252b
REPORT-70452 fix 绘制空border && 清空按钮展示逻辑调整
3 years ago
hades
2ff33cf948
REPORT-70483 cid配置第二天推送,但是alphafine即刻就可以收到推送
3 years ago
hades
8268130207
REPORT-70452 alphafine搜索后,切换tab,文档tab下的状态不正确 && REPORT-70446 面板交互视觉问题
3 years ago
pengda
cae205a54b
Pull request #8725 : REPORT-65492 增加千分比格式
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit '296fafb37e519e1cede94871910de4d6cf1dd4d1':
REPORT-65492 增加千分比格式
3 years ago
lucian
3d82f964be
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
3 years ago
lucian
54aee8313f
REPORT-70504 填报-填报属性设置-数据表搜索时有较大概率多个重复的搜索结果
3 years ago
pengda
296fafb37e
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
3ccca241a3
REPORT-65492 增加千分比格式
3 years ago
superman
ee22b1111e
Merge pull request #8724 in DESIGN/design from release/11.0 to feature/x
...
* commit 'c35d838126e6a37e3c0a3ccf581be003574d9604':
REPORT-69962 超链设置优化多单元格组合设置效果确认 1、修改判断方式,判断单元格有无超链接
3 years ago
superman
c35d838126
Merge pull request #8723 in DESIGN/design from final/11.0 to release/11.0
...
* commit '4a179a0f4f2c8a080c1afb7936bea7994e17514b':
REPORT-69962 超链设置优化多单元格组合设置效果确认 1、修改判断方式,判断单元格有无超链接
3 years ago
superman
4a179a0f4f
Merge pull request #8722 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'cde11963c31c8a9feecfc53f788c8333f24a1e3b':
3 years ago
superman
cde11963c3
Merge pull request #8715 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '7ab40537de73cd0e228837469803c25dc0c958b2':
REPORT-69962 超链设置优化多单元格组合设置效果确认 1、修改判断方式,判断单元格有无超链接
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来
REPORT-69842 修改边框颜色单元格背景颜色会变统一
update
REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题
REPORT-69776 切换在线组件的排序,会加载很久
REPORT-68638 design fix:没有配色的时候渲染和配置界面配色不一致,统一成配置界面的
REPORT-68357 fix:namestyle导致fvs.cpt中单元格样式中有主题相关配置
REPORT-69575 设计器在线组件刷不出来
3 years ago
Lanlan
af3e275294
Merge branch 'feature/x' of ssh://cloud.finedevelop.com:7999/~lanlan/design into feature/x
3 years ago
Lanlan
96e4c35d73
KERNEL-11019 云端运维插件对主 jar 启动速度影响的优化
3 years ago