Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

hong.yang 1 rok temu
rodzic
commit
085df05f55

+ 1 - 1
data-room-ui/package.json

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

+ 2 - 2
data-room-ui/packages/BigScreenDesign/LeftPanel.vue

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

+ 1 - 1
data-room-ui/packages/RemoteComponents/remoteComponentsList.js

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

+ 0 - 1
data-room-ui/packages/js/store/actions.js

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