Просмотр исходного кода

fix: Rustdesk Commands Must Login

lejianwen 1 год назад
Родитель
Сommit
96cf2b29d5
1 измененных файлов с 11 добавлено и 15 удалено
  1. 11 15
      src/views/rustdesk/control.vue

+ 11 - 15
src/views/rustdesk/control.vue

@@ -21,7 +21,7 @@
21
         <el-space>
21
         <el-space>
22
           <RelayServers ref="rs" :can-send="canSendCmd(ID_TARGET)"></RelayServers>
22
           <RelayServers ref="rs" :can-send="canSendCmd(ID_TARGET)"></RelayServers>
23
           <alwaysUseRelay :can-send="canSendCmd(ID_TARGET)" @success="handleAlwaysUseRelaySuccess"></alwaysUseRelay>
23
           <alwaysUseRelay :can-send="canSendCmd(ID_TARGET)" @success="handleAlwaysUseRelaySuccess"></alwaysUseRelay>
24
-          <mustLogin :can-send="canSendCmd(ID_TARGET)"></mustLogin>
24
+          <mustLogin v-if="canControlMustLogin" :can-send="canSendCmd(ID_TARGET)"></mustLogin>
25
           <blocklist :can-send="canSendCmd(RELAY_TARGET)"></blocklist>
25
           <blocklist :can-send="canSendCmd(RELAY_TARGET)"></blocklist>
26
           <blacklist :can-send="canSendCmd(RELAY_TARGET)"></blacklist>
26
           <blacklist :can-send="canSendCmd(RELAY_TARGET)"></blacklist>
27
         </el-space>
27
         </el-space>
@@ -133,35 +133,31 @@
133
   const checkCanSendIdServerCmd = async () => {
133
   const checkCanSendIdServerCmd = async () => {
134
     const res = await sendCmd({ cmd: 'h', target: ID_TARGET }).catch(_ => false)
134
     const res = await sendCmd({ cmd: 'h', target: ID_TARGET }).catch(_ => false)
135
     canSendIdServerCmd.value = !!res.data
135
     canSendIdServerCmd.value = !!res.data
136
+    if (canSendIdServerCmd.value) {
137
+      const commands = res.data.split('\n').filter(i => i)
138
+      console.log(commands)
139
+      canControlMustLogin.value = commands.some(i => i.includes('must-login'))
140
+    }
136
   }
141
   }
142
+
143
+  const canControlMustLogin = ref(false)
137
   const refreshCanSendIdServerCmd = () => {
144
   const refreshCanSendIdServerCmd = () => {
138
-    checkCanSendIdServerCmd().then(_ => {
139
-      if (canSendIdServerCmd.value) {
140
-      }
141
-    })
145
+    checkCanSendIdServerCmd()
142
   }
146
   }
143
   onMounted(refreshCanSendIdServerCmd)
147
   onMounted(refreshCanSendIdServerCmd)
144
 
148
 
145
   const canSendRelayServerCmd = ref(false)
149
   const canSendRelayServerCmd = ref(false)
146
-  const canControlMustLogin = ref(false)
150
+
147
   const checkCanSendRelayServerCmd = async () => {
151
   const checkCanSendRelayServerCmd = async () => {
148
     const res = await sendCmd({ cmd: 'h', target: RELAY_TARGET }).catch(_ => false)
152
     const res = await sendCmd({ cmd: 'h', target: RELAY_TARGET }).catch(_ => false)
149
     canSendRelayServerCmd.value = !!res.data
153
     canSendRelayServerCmd.value = !!res.data
150
-    if (canSendRelayServerCmd.value) {
151
-      const commands = res.data.split('\n').filter(i => i)
152
-      canControlMustLogin.value = commands.some(i => i.includes('must-login'))
153
-    }
154
   }
154
   }
155
   const refreshCanSendRelayServerCmd = () => {
155
   const refreshCanSendRelayServerCmd = () => {
156
-    checkCanSendRelayServerCmd().then(_ => {
157
-      if (canSendRelayServerCmd.value) {
158
-      }
159
-    })
156
+    checkCanSendRelayServerCmd()
160
   }
157
   }
161
   onMounted(refreshCanSendRelayServerCmd)
158
   onMounted(refreshCanSendRelayServerCmd)
162
 
159
 
163
   const rs = ref(null)
160
   const rs = ref(null)
164
-  console.log(rs)
165
   const handleAlwaysUseRelaySuccess = () => {
161
   const handleAlwaysUseRelaySuccess = () => {
166
     rs.value.save()
162
     rs.value.save()
167
   }
163
   }