Explorar el Código

Merge branch 'professional2' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui into professional2

vera_min hace 2 meses
padre
commit
89009a7623
Se han modificado 1 ficheros con 8 adiciones y 11 borrados
  1. 8 11
      src/views/iot/device/product/component/dataParse.vue

+ 8 - 11
src/views/iot/device/product/component/dataParse.vue

@@ -5,7 +5,7 @@
 			<el-icon v-else @click="toggleFullScreen" title="退出全屏"><Close /></el-icon>
 		</div>
 		<div class="flex" style="align-items: stretch">
-			<codeEditor class="params flex1" ref="mirrorRef" style="height: calc(100vh - 310px)" mode="javascript" :content="content"></codeEditor>
+			<codeEditor class="params flex1" ref="mirrorRef" style="height: calc(100vh - 310px)" mode="javascript" :content="script || emptyFunction"></codeEditor>
 			<div class="mock" style="width: 300px; margin-left: 20px">
 				<el-radio-group v-model="functionName">
 					<el-radio-button label="parse">parse</el-radio-button>
@@ -58,22 +58,19 @@ const route = useRoute()
 
 const emit = defineEmits(['updateScript'])
 
-const props = defineProps({
+defineProps({
 	script: String,
 })
 
 const inputData = ref('')
 const outputData = ref('')
-const content = ref('')
 const functionName = ref('parse')
 const runing = ref(false)
 const mirrorRef = ref()
 const isFullScreen = ref(false)
-const wrapperRef = ref(null)
+const wrapperRef = ref()
 
 onMounted(() => {
-	content.value = props.script! || emptyFunction
-
 	// 添加全屏变化事件监听
 	document.addEventListener('fullscreenchange', handleFullscreenChange)
 	document.addEventListener('webkitfullscreenchange', handleFullscreenChange)
@@ -92,16 +89,16 @@ onUnmounted(() => {
 const toggleFullScreen = () => {
 	if (!isFullScreen.value) {
 		// 进入全屏
-		const element = wrapperRef.value as HTMLElement
+		const element = wrapperRef.value! as HTMLElement
 		if (element) {
 			if (element.requestFullscreen) {
 				element.requestFullscreen()
 			} else if ((element as any).webkitRequestFullscreen) {
 				// Safari
-				;(element as any).webkitRequestFullscreen()
+				(element as any).webkitRequestFullscreen()
 			} else if ((element as any).msRequestFullscreen) {
 				// IE11
-				;(element as any).msRequestFullscreen()
+				(element as any).msRequestFullscreen()
 			}
 		}
 	} else {
@@ -110,10 +107,10 @@ const toggleFullScreen = () => {
 			document.exitFullscreen()
 		} else if ((document as any).webkitExitFullscreen) {
 			// Safari
-			;(document as any).webkitExitFullscreen()
+			(document as any).webkitExitFullscreen()
 		} else if ((document as any).msExitFullscreen) {
 			// IE11
-			;(document as any).msExitFullscreen()
+			(document as any).msExitFullscreen()
 		}
 	}
 	isFullScreen.value = !isFullScreen.value