shine
6a225d293d
merge:先把我自己的改回去
4 years ago
shine
9e8b3d3ea7
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
4 years ago
shine
1a2d4acb63
feat:对接扩展图表
4 years ago
superman
723a34a68f
Merge pull request #4712 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'b5c77640343f9620514516047daa193b4006770d':
REPORT-53647 下载路由修改
REPORT-51958 设计器通知中心调整
4 years ago
superman
b5c7764034
Merge pull request #4709 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '7c1dbd6fc4b57451ae2f889925c88714562177b8':
REPORT-53647 下载路由修改
4 years ago
superman
7c1dbd6fc4
Merge pull request #4708 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'bd97947f98fb09d83f9c6cbcb339ca8ab1a3dd8b':
REPORT-53647 下载路由修改
REPORT-51958 设计器通知中心调整
4 years ago
superman
bd97947f98
Merge pull request #4707 in DESIGN/design from final/10.0 to release/10.0
...
* commit '263ffdb6b89be080c01b2ec17081e4c53f3da41a':
REPORT-53647 下载路由修改
4 years ago
pengda
0c41f0b6ed
REPORT-54277 消息推送-消息中心-看不到推送的消息
4 years ago
Kara
263ffdb6b8
Pull request #4705 : REPORT-53647 下载路由修改
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit '5b5e99405396e48645d7f1238b8acabe240a64fa':
REPORT-53647 下载路由修改
4 years ago
kerry
5b5e994053
REPORT-53647 下载路由修改
4 years ago
yaoh.wu
ef0a617fcd
Pull request #4703 : 无任务,同步代码
...
Merge in DESIGN/design from final/10.0 to release/10.0
* commit 'bbb16dc0adf657dcb895fe3cf7363e18379b55d5':
REPORT-51958 设计器通知中心调整
4 years ago
yaoh.wu
daccab925b
Pull request #4704 : 无任务,同步代码
...
Merge in DESIGN/design from final/10.0 to feature/10.0
* commit 'bbb16dc0adf657dcb895fe3cf7363e18379b55d5':
REPORT-51958 设计器通知中心调整
4 years ago
Kara
bbb16dc0ad
Pull request #4702 : REPORT-51958 设计器通知中心调整
...
Merge in DESIGN/design from ~LANLAN/design:final/10.0 to final/10.0
* commit '5fb9e0be58260d4aa58aeb2df2ee34dd4ff6f044':
REPORT-51958 设计器通知中心调整
4 years ago
Lanlan
5fb9e0be58
REPORT-51958 设计器通知中心调整
4 years ago
superman
9dc8bcf5d1
Merge pull request #4694 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'effe7d273474047175947ee2f972501060d6ebc2':
4 years ago
superman
effe7d2734
Merge pull request #4691 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'c21b8d05974aff11886469022cbfbbfc4f57b7d0':
4 years ago
superman
c21b8d0597
Merge pull request #4690 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'cc46382c5fd71770e8de2467c7416e0f9088c389':
4 years ago
superman
cc46382c5f
Merge pull request #4689 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ba0acfa03fed275c97743faf75f021a0cef9ef57':
4 years ago
superman
ba0acfa03f
Merge pull request #4687 in DESIGN/design from release/10.0 to final/10.0
...
* commit '5450dc3942f2c360421681ad81702954012eeb96': (162 commits)
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53775 条件属性弹窗概率性 关闭不了
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
fix
REPORT-53875 新增组件库弹框
CHART-19556 富文本轻量级加载,使用完之后销毁
REPORT-53711 设计器用户登录策略调整-插件无法安装
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
REPORT-51958 远程环境检测及同步
增加对验证码长度的校验
修复引导页面无法关闭的问题
fix
CHART-19525 富文本编辑框设置为可调整
修改延迟时间
REPORT-51360 设计器消息提醒
...
4 years ago
superman
b9de9934eb
Merge pull request #4679 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '15ad39a88670a10af13851ba6d82ca677014f240':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
15ad39a886
Merge pull request #4676 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '13cee6401441a0e882286ca95e0313f157db8dee':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
13cee64014
Merge pull request #4675 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5450dc3942f2c360421681ad81702954012eeb96':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
5450dc3942
Merge pull request #4674 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f3beaeca3620319f3341dfea2695ca24b27d3faf':
4 years ago
superman
f3beaeca36
Merge pull request #4673 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9b66502b580edb42f7169753f3b8b4d036b008aa':
4 years ago
Lanlan
a1f2b4ea39
Pull request #4670 : REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '931e02c8513e52b4357ae4199f349d053b5f1be9':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
4 years ago
superman
9b66502b58
Merge pull request #4672 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '4476bed0b47f3219b853f3e5a77c7b1c2b1cb52d':
4 years ago
superman
4d37a65605
Merge pull request #4671 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '156b0b9f239b8103367f1b8d3c3bed71ca26c75c':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
Hades
6be1e11709
Pull request #4662 : REPORT-53775 条件属性弹窗概率性 关闭不了
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '13542e7d680cf099a6602ade7166df987359a55e':
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
Lanlan
931e02c851
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
4 years ago
Lanlan
43d83202ed
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
4 years ago
superman
156b0b9f23
Merge pull request #4667 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bd2cdbb7544446dc4995773a69b76bccd5e0b89c':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
superman
bd2cdbb754
Merge pull request #4666 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8f2675506b87671e5a5554eb033786db8f2c92d':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
kerry
d8f2675506
Pull request #4663 : REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '52663464441fc47d316c7fd58cddf94584b7d3e2':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
4 years ago
kerry
5266346444
代码修改
4 years ago
kerry
cc792aae6b
代码修改
4 years ago
kerry
2bd3625d69
增加username参数
4 years ago
kerry
ddcfd7cea6
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
4 years ago
pengda
ef254e4c3b
Pull request #4654 : REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'cfcdb21c80a56e457eb4ebf1bbb6b7ec538f5cc1':
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
hades
13542e7d68
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
2c3625d933
Merge pull request #4661 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8863345a0778d44e7d601c37d59dc51bfe818f8a':
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
fix
REPORT-53875 新增组件库弹框
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
superman
8863345a07
Merge pull request #4658 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'be11edc537ba44e7f6fdf4ad1a7ec8bd709c16e2':
fix
REPORT-53875 新增组件库弹框
4 years ago
superman
be11edc537
Merge pull request #4657 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '59e44c1a3063fc27026374b049027deb2f82cd43':
fix
REPORT-53875 新增组件库弹框
4 years ago
Henry.Wang
c9569afa24
Pull request #4653 : KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'd240aba665366092c3872e986ef409b81c755da0':
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
pengda
cfcdb21c80
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
pengda
1d66687554
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
pengda
6072f19b3c
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
Lanlan
59e44c1a30
Pull request #4652 : REPORT-53875 新增组件库弹框
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '4aec5671a5b0edda1327a52f18f1cc7a9372d891':
fix
REPORT-53875 新增组件库弹框
4 years ago
Henry.Wang
d240aba665
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Henry.Wang
d2a0736412
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Henry.Wang
0c510a7dae
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago