Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '03f3c716755be677e640e369b7191461a990cf8a':
REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '7413a41304532d1825b1ad751f05b73c6c2789fc':
CHART-14104 坐标轴切换前后,传递网格线属性
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '0e2370b266d4d913fcbabb80de44b26e0fce2478':
CHART-13666 国际化修改
CHART-13666
CHART-13666 图表自动类型推荐
Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '04b01ff4664ca43ae8db712cd02ba1bf4b7185f3':
import设置不对
REPORT-33731 带参存储过程预览没有弹出参数输入框
Merge in DESIGN/design from ~DREW/design:release/10.0 to release/10.0
* commit '4c101df6e9b362b60b6f7634778e4caf85af1b6a':
代码简化
MOBILE-27532 单选/复选按钮组自适应高度
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '488616bc6427cf67e67297eae7b9035326135424':
删除无用方法
REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6a348cafe42913cada511d9f639222bd4625214b':
CHART-14264 修改配色面板样式
修改兼容方式
CHART-14228 向下兼容网格线
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit 'b82e174ae31d479d14b0e0b88f0dfe84b4012e4e':
MOBILE-27254 联排按钮Tab样式支持上下边距调整
MOBILE-27254 联排按钮Tab样式支持上下边距调整
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '8dd7b88c1cc3a8878fad58926a82a716398b9ea2':
CHART-14220 调整条件属性中配色的布局方式
CHART-14218 调整颜色面板组件顺序、渐变时配色面板隐藏
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'c78baf759fcbe29362cefebf1e815679243def4f':
REPORT-31990 设计器右侧面板新增tab接口
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '53053c3612efcedbacdc4fe688e931ceec9c9ae9':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 名字需要首先加上默认值 0
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '9a9f48eadc6771100fdf8f57bc5107fb64635d11':
REPORT-33369 在A目录的修改没有点确定。在B目录确定,A的修改也会保存