zheng
b5246fa1e6
Pull request #4793 : CHART-18787 design 细节调整
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen
* commit '8a689f647ea4b70c321f08b2ea1c872ad8229ab7':
feat:其他组合图不需要类型界面,自定义组合图需要
refactor:plugin use 10.0 not compatible xxx copy from 10.0 code
feat:类型和特性面板如果没有其他设置项 则拿掉
4 years ago
shine
8a689f647e
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
4 years ago
shine
e574e8af63
feat:其他组合图不需要类型界面,自定义组合图需要
4 years ago
shine
367eb6e135
refactor:plugin use 10.0 not compatible xxx copy from 10.0 code
4 years ago
ju|剧浩宇
b12d07bb10
Pull request #4780 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~BJORN/design:feature/big-screen to feature/big-screen
* commit '37eba1e876d5fc87a8fe43f567435f0ccb5754cd':
CHART-19508 图表切换支持调整顺序和复制
REPORT-54354 去掉程序数据集的编辑功能
4 years ago
白岳
37eba1e876
无JIRA任务 解决冲突
4 years ago
superman
14c7d7340b
Merge pull request #4775 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '5c729cca59eb37051828de0a9f64956be3e9e603':
REPORT-54354 去掉程序数据集的编辑功能
4 years ago
shine
4885d330f0
feat:类型和特性面板如果没有其他设置项 则拿掉
4 years ago
Bjorn
57309591bc
Pull request #4769 : CHART-19508 图表切换支持调整顺序和复制
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'f50ff38e0a7da401bc2036c9d292602f1321995a':
CHART-19508 图表切换支持调整顺序和复制
4 years ago
Xiqiu
5c729cca59
Pull request #4758 : REPORT-54354 去掉程序数据集的编辑功能
...
Merge in DESIGN/design from ~XIQIU/design:bugfix/10.0 to bugfix/10.0
* commit 'b0cf8ba593adaed63062caf94dea3ca854ce6a8e':
REPORT-54354 去掉程序数据集的编辑功能
4 years ago
白岳
f50ff38e0a
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bjorn/design into feature/10.0
4 years ago
白岳
bf84ab6a3e
CHART-19508 图表切换支持调整顺序和复制
4 years ago
superman
1b44058970
Merge pull request #4768 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8f73f4e527d8c414252796df9d8482bf505ae521':
之前漏传了一张图片
4 years ago
superman
8f73f4e527
Merge pull request #4764 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '5e49942f87d35c980bf66e22eff3b71708f406d3':
之前漏传了一张图片
4 years ago
superman
5e49942f87
Merge pull request #4763 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '96f47fac715542eac740ff22556f7a92aef694a5':
之前漏传了一张图片
4 years ago
superman
96f47fac71
Merge pull request #4762 in DESIGN/design from final/10.0 to release/10.0
...
* commit '1bff02846b67973a8445105c8b93904dce70eb59':
之前漏传了一张图片
4 years ago
Kara
1bff02846b
Pull request #4743 : REPORT-54355 ReuFilter 远程兼容问题
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit 'f17a135216daabddc24fc2244eb0ff0a453851ca':
之前漏传了一张图片
4 years ago
xiqiu
b0cf8ba593
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
4 years ago
xiqiu
3b09edb222
REPORT-54354 去掉程序数据集的编辑功能
4 years ago
kerry
f17a135216
之前漏传了一张图片
4 years ago
superman
17d42d44bd
Merge pull request #4742 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '79b31f155a529ea09fc5c8043e3382c080907d54':
代码修改
REPORT-54355 ReuFilter 远程兼容问题
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
REPORT-54308 模板缺失插件设计改进设计器提供配置
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
superman
79b31f155a
Merge pull request #4739 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd603eca85c0c12c9f2080ed77b18bab9a0dc3128':
4 years ago
superman
d603eca85c
Merge pull request #4738 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '30a3d7880655130f1f568d27e0b9bf5119d9bcd6':
4 years ago
superman
30a3d78806
Merge pull request #4737 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'c4c4f5f47f902a4dad86d98478fd3c6a079aaabd':
4 years ago
superman
c4c4f5f47f
Merge pull request #4736 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '1f6cf707485b3139630c08fbd78fdbf4394c5b40':
4 years ago
superman
1f6cf70748
Merge pull request #4735 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '79da1e36da825bfa007876b3124f208c9a5f2b75': (176 commits)
代码修改
REPORT-54355 ReuFilter 远程兼容问题
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
REPORT-54308 模板缺失插件设计改进设计器提供配置
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-53647 下载路由修改
REPORT-51958 设计器通知中心调整
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53775 条件属性弹窗概率性 关闭不了
...
4 years ago
superman
d53540a727
Merge pull request #4732 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '0b846a1fc62f212b6d345dca8ef649be57ef2cd3':
代码修改
REPORT-54355 ReuFilter 远程兼容问题
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
REPORT-54308 模板缺失插件设计改进设计器提供配置
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
superman
0b846a1fc6
Merge pull request #4731 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '4b1fd4c5d85beae2ce54d55aad5dec53918e29b7':
代码修改
REPORT-54355 ReuFilter 远程兼容问题
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
REPORT-54308 模板缺失插件设计改进设计器提供配置
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
superman
4b1fd4c5d8
Merge pull request #4730 in DESIGN/design from final/10.0 to release/10.0
...
* commit '79da1e36da825bfa007876b3124f208c9a5f2b75':
代码修改
REPORT-54355 ReuFilter 远程兼容问题
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
REPORT-54308 模板缺失插件设计改进设计器提供配置
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
Kara
79da1e36da
Pull request #4728 : REPORT-54355 ReuFilter 远程兼容问题
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit 'fefbfb80278d429e899567017e79859efa72111a':
代码修改
REPORT-54355 ReuFilter 远程兼容问题
4 years ago
kerry
fefbfb8027
代码修改
4 years ago
kerry
90f5426ab6
REPORT-54355 ReuFilter 远程兼容问题
4 years ago
Kara
9c4bc2a9ca
Pull request #4727 : REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit '9ccbf778ec5a2f2890357978d396b8ac9d7c3baf':
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
4 years ago
kerry
9ccbf778ec
REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
4 years ago
Kara
5d303b66c6
Pull request #4719 : REPORT-54308 模板缺失插件设计改进设计器提供配置
...
Merge in DESIGN/design from ~VITO/c-design:final/10.0 to final/10.0
* commit 'c744ee33416735e807064f2df54e3e65b15fa964':
REPORT-54308 模板缺失插件设计改进设计器提供配置
4 years ago
Kara
b0decce6ea
Pull request #4718 : REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
...
Merge in DESIGN/design from ~PENGDA/design:final/10.0 to final/10.0
* commit '38c22d8d667d8e1369b9dbe0290aedbcd76be0ea':
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
superman
d20d3dd134
Merge pull request #4726 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'a77da210fc8baac8db5e981fa9e2315e1669cb1c':
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
superman
a77da210fc
Merge pull request #4723 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a3110ddf94ba4c9a80d6e5e71360f538b0919873':
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
superman
a3110ddf94
Merge pull request #4722 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '4d1fa4c41537cb6c71831cea3de354a36f35f2bc':
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
superman
4d1fa4c415
Merge pull request #4721 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e35141284d81fd4957acae9080dc61097e491e6c':
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
vito
c744ee3341
Merge branch 'final/10.0' of https://code.fineres.com/scm/~vito/c-design into final/10.0
4 years ago
vito
ab54e76156
REPORT-54308 模板缺失插件设计改进设计器提供配置
4 years ago
Kara
e35141284d
Pull request #4717 : REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
...
Merge in DESIGN/design from ~LANLAN/design:final/10.0 to final/10.0
* commit '5e07dc67f4b96c49fea89d228705f38df89b237f':
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
4 years ago
pengda
38c22d8d66
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
4 years ago
pengda
d320face0a
REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
4 years ago
Lanlan
5e07dc67f4
REPORT-54332 mac设计器:帆软通行证在插件管理打开时的提示文本被插件管理遮挡
4 years ago
Kara
5ed8948039
Pull request #4713 : REPORT-54277 消息推送-消息中心-看不到推送的消息
...
Merge in DESIGN/design from ~PENGDA/design:final/10.0 to final/10.0
* commit '23d630e74bf23b54022d304763d33117f2c71040':
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
Kara
7bcc23d415
Pull request #4716 : REPORT-54301 & REPORT-54252 & REPORT-54317
...
Merge in DESIGN/design from ~LANLAN/design:final/10.0 to final/10.0
* commit 'd88658b6ded226729b991b98fd48e383e291c6c1':
REPORT-54317 登录页面优化-密码登录-UI问题
REPORT-54252 登录页面-手机区号无法下拉选择
REPORT-54301 点击模板商城支持单点登录
4 years ago
Lanlan
d88658b6de
REPORT-54317 登录页面优化-密码登录-UI问题
4 years ago
Lanlan
2bac392761
REPORT-54252 登录页面-手机区号无法下拉选择
4 years ago