mxd 3 rokov pred
rodič
commit
4ce4e63f98

+ 4 - 2
src/components/magic-editor.vue

@@ -174,9 +174,11 @@ const checkUpdate = () => {
 			}
 		})
 }
+
+const getMagicTokenValue = () => (config.getMagicTokenValue && config.getMagicTokenValue()) || store.get(constants.STORE.token) || constants.HEADER_MAGIC_TOKEN_VALUE
 const autoLogin = () => {
 	return new Promise(resolve => {
-		constants.HEADER_MAGIC_TOKEN_VALUE = store.get(constants.STORE.token) || constants.HEADER_MAGIC_TOKEN_VALUE
+		constants.HEADER_MAGIC_TOKEN_VALUE = getMagicTokenValue()
 		bus.status('message.tryAutoLogin')
 		request.sendPost('/login').success(isLogin => {
 			showLogin.value = !isLogin
@@ -276,7 +278,7 @@ bus.$on(Message.MESSAGE, (msgType, content) => {
 })
 bus.$event(Socket.OPEN, () => {
 	constants.CLIENT_ID = randomString(16)
-	nextTick(() => bus.send(Socket.LOGIN, [constants.HEADER_MAGIC_TOKEN_VALUE, constants.CLIENT_ID].join(',')))
+	nextTick(() => bus.send(Socket.LOGIN, [getMagicTokenValue(), constants.CLIENT_ID].join(',')))
 })
 bus.$event(Socket.LOGIN_RESPONSE, ([ret, user]) => {
 	if(ret === '1'){

+ 1 - 1
src/components/panel/main/magic-resource.vue

@@ -604,6 +604,6 @@ onMounted(() => emits('onLoad'))
 	flex: 1
 }
 .magic-resource :deep(.magic-avatar-group){
-	margin-left: 5px;
+	margin-left: 10px;
 }
 </style>

+ 1 - 1
src/components/panel/main/magic-script-editor.vue

@@ -351,6 +351,6 @@ onMounted(() => emit('onLoad'))
 	overflow: visible !important;
 }
 .magic-script-editor :deep(.magic-avatar-group){
-	margin-left: 5px;
+	margin-left: 10px;
 }
 </style>