Merge remote-tracking branch 'origin/master'

main
hong.yang 2 years ago
commit 085df05f55

@ -1,6 +1,6 @@
{ {
"name": "@gcpaas/data-room-ui", "name": "@gcpaas/data-room-ui",
"version": "1.0.1-2023081502-Alpha", "version": "1.0.1-2023081602-Alpha",
"description": "自定义大屏", "description": "自定义大屏",
"author": "gcpaas", "author": "gcpaas",
"license": "MIT", "license": "MIT",

@ -42,7 +42,7 @@
slot="label" slot="label"
class="menu-slot" class="menu-slot"
name="layer" name="layer"
@dbclick.native="toggleSidebar" @dbclick="toggleSidebar"
> >
<i <i
:class="['iconfont-bigscreen', 'icon-layer']" :class="['iconfont-bigscreen', 'icon-layer']"
@ -75,7 +75,7 @@
<div <div
slot="label" slot="label"
class="menu-slot" class="menu-slot"
@dbclick.native="toggleSidebar" @dbclick="toggleSidebar"
> >
<i <i
:class="['iconfont-bigscreen', menu.icon]" :class="['iconfont-bigscreen', menu.icon]"

@ -23,7 +23,7 @@ export default getRemoteComponents(innerRemoteComponents)
// 抛出外部的用户系统组件 // 抛出外部的用户系统组件
export function getRemoteComponents (comList) { export function getRemoteComponents (comList) {
const customList = comList || window.BS_CONFIG?.remoteComponents const customList = (comList || window.BS_CONFIG?.remoteComponents) || []
const list = [] const list = []
customList.forEach((config) => { customList.forEach((config) => {

@ -6,7 +6,6 @@ import { getScreenInfo, getDataSetDetails, getDataByDataSetId } from '../api/big
import { stringToFunction } from '../utils/evalFunctions' import { stringToFunction } from '../utils/evalFunctions'
import { EventBus } from '../utils/eventBus' import { EventBus } from '../utils/eventBus'
import plotList from 'data-room-ui/G2Plots/plotList' import plotList from 'data-room-ui/G2Plots/plotList'
// import innerRemoteComponents, { getRemoteComponents } from 'data-room-ui/RemoteComponents/remoteComponentsList'
export default { export default {
// 初始化页面数据 // 初始化页面数据
initLayout ({ commit, dispatch }, code) { initLayout ({ commit, dispatch }, code) {

Loading…
Cancel
Save