Unverified 提交 77b1991e authored 作者: 王嘉豪's avatar 王嘉豪 提交者: GitHub

Merge pull request #1348 from dataease/v1.5

V1.5
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:element="config" :element="config"
:search-count="searchCount" :search-count="searchCount"
:h="config.style.height" :h="config.style.height"
:edit-mode="'preview'"
/> />
</div> </div>
</template> </template>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<video-player <video-player
ref="videoPlayer" ref="videoPlayer"
class="vjs-custom-skin" class="vjs-custom-skin"
:options="playerOptions" :options="editMode==='preview'?pOption:playerOptions"
:playsinline="true" :playsinline="true"
@play="onPlayerPlay($event)" @play="onPlayerPlay($event)"
@pause="onPlayerPause($event)" @pause="onPlayerPause($event)"
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
editMode: { editMode: {
type: String, type: String,
require: false, require: false,
default: 'preview' default: 'edit'
}, },
active: { active: {
type: Boolean, type: Boolean,
...@@ -59,8 +59,13 @@ export default { ...@@ -59,8 +59,13 @@ export default {
}, },
data() { data() {
return { return {
pOption: {}
} }
}, },
created() {
this.pOption = this.element.videoLinks[this.element.videoLinks.videoType]
this.pOption.height = this.h - (this.curGap * 2)
},
computed: { computed: {
moveFlag() { moveFlag() {
return (this.element.optStatus.dragging || this.element.optStatus.resizing) return (this.element.optStatus.dragging || this.element.optStatus.resizing)
......
...@@ -319,13 +319,17 @@ export default { ...@@ -319,13 +319,17 @@ export default {
} }
return true return true
}).catch(err => { }).catch(err => {
this.httpRequest.status = err.response.data.success
this.httpRequest.msg = err.response.data.message
this.requestStatus = 'error' this.requestStatus = 'error'
if (err && err.response && err.response.data) { if (err.message && err.message.indexOf('timeout') > -1) {
this.message = err.response.data.message this.message = this.$t('panel.timeout_refresh')
} else { } else {
this.message = err this.httpRequest.status = err.response.data.success
this.httpRequest.msg = err.response.data.message
if (err && err.response && err.response.data) {
this.message = err.response.data.message
} else {
this.message = err
}
} }
return true return true
}) })
......
...@@ -1425,7 +1425,8 @@ export default { ...@@ -1425,7 +1425,8 @@ export default {
video_links: 'Video Links', video_links: 'Video Links',
video_add_tips: 'Please Add Video Info...', video_add_tips: 'Please Add Video Info...',
panel_view_result_show: 'View Result Show', panel_view_result_show: 'View Result Show',
panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000' panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000',
timeout_refresh: 'Timeout,Will Refresh...'
}, },
plugin: { plugin: {
local_install: 'Local installation', local_install: 'Local installation',
......
...@@ -1428,7 +1428,8 @@ export default { ...@@ -1428,7 +1428,8 @@ export default {
video_links: '視頻鏈接', video_links: '視頻鏈接',
video_add_tips: '請點擊添加配置視頻信息...', video_add_tips: '請點擊添加配置視頻信息...',
panel_view_result_show: '視圖結果展示', panel_view_result_show: '視圖結果展示',
panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000' panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000',
timeout_refresh: '请求超时,稍后刷新...'
}, },
plugin: { plugin: {
local_install: '本地安裝', local_install: '本地安裝',
......
...@@ -1436,7 +1436,8 @@ export default { ...@@ -1436,7 +1436,8 @@ export default {
video_links: '视频链接', video_links: '视频链接',
video_add_tips: '请点击添加配置视频信息...', video_add_tips: '请点击添加配置视频信息...',
panel_view_result_show: '视图结果展示', panel_view_result_show: '视图结果展示',
panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000' panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000',
timeout_refresh: '请求超时,稍后刷新...'
}, },
plugin: { plugin: {
local_install: '本地安装', local_install: '本地安装',
......
...@@ -74,7 +74,9 @@ router.beforeEach(async(to, from, next) => { ...@@ -74,7 +74,9 @@ router.beforeEach(async(to, from, next) => {
}) })
export const loadMenus = (next, to) => { export const loadMenus = (next, to) => {
buildMenus().then(res => { buildMenus().then(res => {
const filterDatas = filterRouter(res.data) const datas = res.data
disableSomeMenu(datas)
const filterDatas = filterRouter(datas)
const asyncRouter = filterAsyncRouter(filterDatas) const asyncRouter = filterAsyncRouter(filterDatas)
asyncRouter.push({ path: '*', redirect: '/404', hidden: true }) asyncRouter.push({ path: '*', redirect: '/404', hidden: true })
store.dispatch('permission/GenerateRoutes', asyncRouter).then(() => { // 存储路由 store.dispatch('permission/GenerateRoutes', asyncRouter).then(() => { // 存储路由
...@@ -87,6 +89,17 @@ export const loadMenus = (next, to) => { ...@@ -87,6 +89,17 @@ export const loadMenus = (next, to) => {
}) })
}) })
} }
const disableSomeMenu = datas => {
datas.forEach(menu => {
if (menu.name === 'system') {
menu.children.forEach(item => {
if (item.name === 'sys-task') {
item.children = [item.children[0]]
}
})
}
})
}
/** /**
* 验证path是否有效 * 验证path是否有效
......
...@@ -93,10 +93,6 @@ ...@@ -93,10 +93,6 @@
<svg-icon icon-class="ds-custom" class="ds-icon-custom" /> <svg-icon icon-class="ds-custom" class="ds-icon-custom" />
{{ $t('dataset.custom_data') }} {{ $t('dataset.custom_data') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="beforeClickAddData('union',data)">
<svg-icon icon-class="ds-union" class="ds-icon-union" />
{{ $t('dataset.union_data') }}
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</el-dropdown-item> </el-dropdown-item>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论