superman
954a20aaeb
Merge pull request #6132 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '66a242a88dcbfaf57a6ec9bf043e8662608ef844':
fix:兼容大屏组件的cpt设置
3 years ago
superman
66a242a88d
Merge pull request #6131 in DESIGN/design from final/10.0 to release/10.0
...
* commit '4bc26630ab18f697c705f3a1d94e7d936223aaad':
fix:兼容大屏组件的cpt设置
3 years ago
eason
4bc26630ab
Pull request #6124 : CHART-20651:兼容插件的cpt设置
...
Merge in DESIGN/design from ~EASON/design:release/10.0 to final/10.0
* commit '5034de4cb7cdabdbda27d9c1ac398f7652ceae71':
fix:兼容大屏组件的cpt设置
3 years ago
eason
5034de4cb7
fix:兼容大屏组件的cpt设置
3 years ago
superman
51046bcfe5
Merge pull request #6109 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '0cdec8f89502fd61cb4db57f53081445994c9ba8':
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
superman
0cdec8f895
Merge pull request #6108 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2d3e4f47a55d5a1c11efecf37e4d924f626f0288':
3 years ago
superman
2d3e4f47a5
Merge pull request #6106 in DESIGN/design from release/10.0 to final/10.0
...
* commit '90e8684e1d507b7bc24540a5460924d256c3a047': (38 commits)
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
REPORT-60004 远程设计-保存弹窗 目录显示问题
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全
add executeJavaScriptAndReturnValue function
...
3 years ago
superman
90e8684e1d
Merge pull request #6105 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'ff712425a3839c4503002b2e964bf9f357a2550a':
3 years ago
eason
8f6bd92877
Pull request #6099 : 无JIRA任务 代码合并
...
Merge in DESIGN/design from feature/10.0 to release/10.0
* commit '75a372ffb25c1d470c15c638b7e92839122ce17d':
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
superman
ff712425a3
Merge pull request #6103 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '387fb172f7cb52a0c5bf0301e07147949862b6c9':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
REPORT-60134 表单组件属性国际化-显示不全
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Henry.Wang
387fb172f7
Pull request #6084 : REPORT-59681 远程设计控制模板自适应权限控制
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '8edae1949cb668399f4d4341b8e60dafe81b61da':
REPORT-59681 远程设计控制模板自适应权限控制
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Hades
6c47b1513c
Pull request #6093 : REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '25f5999d450e06a472edfa5db935e76ddc5f5347':
REPORT-50201 fix 拼写错误
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
3 years ago
fanglei
ad3256a491
Pull request #6092 : REPORT-60134 表单组件属性国际化-显示不全
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'b5296e5251015737e03cefaad67e2e195bcd5799':
REPORT-60134 表单组件属性国际化-显示不全
3 years ago
hades
25f5999d45
REPORT-50201 fix 拼写错误
3 years ago
hades
6cfbdf33a2
REPORT-50201 远程af搜索模板,部分模板右侧加载不出来
3 years ago
方磊
b5296e5251
REPORT-60134 表单组件属性国际化-显示不全
3 years ago
superman
75a372ffb2
Merge pull request #6088 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '57691bba7262f9f7c9a15d9af718c78d99471a30':
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
3 years ago
superman
57691bba72
Merge pull request #6087 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e91dfe92b36040683ae586f7ab15c0490556f8bb':
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
3 years ago
Henry.Wang
8edae1949c
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
Henry.Wang
c4f405531a
REPORT-59681 远程设计控制模板自适应权限控制
3 years ago
zheng
737dde0026
Pull request #6078 : CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'd2b695358e9f6dd2c3ea7b662e7af8d5c159a850':
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
3 years ago
Hades
e91dfe92b3
Pull request #6076 : REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '7ada3e18e010964529dbba1b79422cf0b3d9f313':
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
3 years ago
shine
d2b695358e
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
29835e7d04
CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
3 years ago
hades
7ada3e18e0
REPORT-59959 设计器-设计器操作-11设计器制作的附件模板,10设计器可以打开;但其他的11做的模板,尝试用10打开时都会正常提示弹窗打不开
3 years ago
zheng
227057415e
Pull request #6048 : CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'd90c98588357b97d26dfa52b26e711b309c9ec51':
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
3 years ago
superman
9b7f720b36
Merge pull request #6052 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1857733955f72a2073d621247e495d65a9e79542':
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
Lucian.Chen
1857733955
Pull request #6029 : REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit 'cc19c999e3fa7c27929d108ca6b75406b1df8f37':
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
shine
d90c985883
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
b7fae76db7
CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
3 years ago
lucian
cc19c999e3
REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
3 years ago
superman
6217c56855
Merge pull request #6010 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '159e071708da5229a675642e7b144c979a83f97d':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
superman
159e071708
Merge pull request #6009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1f8bd7a1d6f90d714a8d1520586e39677b959b60':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
eason
acf2e8c978
Pull request #5981 : CHART-20411 适配 大屏模板 文件菜单
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '77c7a84eecde096651e1822302db51d47f79ed8e':
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
3 years ago
shine
77c7a84eec
和抽之前完全一样
3 years ago
Hades
1f8bd7a1d6
Pull request #5979 : REPORT-60004 远程设计-保存弹窗 目录显示问题
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '71c15a84accd64ae515f8a3ff217758b123b989c':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
shine
291452a0f5
CHART-21076 清楚磁盘缓存
3 years ago
shine
236125c553
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
ac01b5c6fe
CHART-20411 适配大屏模板关闭
3 years ago
shine
2a967d27f2
CHART-20411 适配大屏模板另存为
3 years ago
hades
71c15a84ac
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
superman
ddb83185d8
Merge pull request #5969 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2ec5de4bb1ec7e794d54c2cd1ac1f216b8e1a143':
REPORT-57551 设计器显示,自适应布局下body背景设置以后,画布中没有实时显示背景
3 years ago
zheng
0f5d60f75f
Pull request #5970 : CHART-20686 fix bugs
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '2adee772b27b5092297900c75b180bfe9215f80e':
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
3 years ago
zheng
d15b1510df
Pull request #5963 : CHART-21014 fix: 大屏模板中的cpt组件里面还是要有全部图表类型的
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '8c8873de3d238fe76eac21cbbf88138a77a5fe45':
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
3 years ago
shine
2adee772b2
CHART-20686 大屏模板中的图表不支持导出
3 years ago
superman
2ec5de4bb1
Merge pull request #5968 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '37244ffdf28063263b772d5e3f44723fdfa35e99':
REPORT-57551 设计器显示,自适应布局下body背景设置以后,画布中没有实时显示背景
3 years ago
superman
37244ffdf2
Merge pull request #5967 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e8abf8cc271c58fd17f1c36e66bcbc68b2c9d17a':
REPORT-57551 设计器显示,自适应布局下body背景设置以后,画布中没有实时显示背景
3 years ago
shine
026ecab6ad
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
3 years ago
shine
8c8873de3d
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
0c327207bc
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
3 years ago