12-12
This commit is contained in:
@ -453,7 +453,7 @@ function createWindow(): void {
|
|||||||
...params,
|
...params,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
...params.webPreferences,
|
...params.webPreferences,
|
||||||
session: tempSession, // 关键:使用独立会话
|
session: params.webPreferences?.session ? tempSession : null, // 关键:使用独立会话
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
contextIsolation: false,
|
contextIsolation: false,
|
||||||
devTools: true,
|
devTools: true,
|
||||||
@ -628,7 +628,7 @@ function windowAllClosed() {
|
|||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
forceQuit();
|
forceQuit();
|
||||||
}, 500);
|
}, 1000);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
8
src/renderer/public/sdk/YJEarth.min.js
vendored
8
src/renderer/public/sdk/YJEarth.min.js
vendored
File diff suppressed because one or more lines are too long
@ -3502,7 +3502,7 @@
|
|||||||
|
|
||||||
.YJ-custom-checkbox-left:checked::after,
|
.YJ-custom-checkbox-left:checked::after,
|
||||||
.YJ-custom-checkbox-right:checked::after {
|
.YJ-custom-checkbox-right:checked::after {
|
||||||
content: "✔";
|
content: "\2714";
|
||||||
background-color: rgba(var(--color-base1), 1);
|
background-color: rgba(var(--color-base1), 1);
|
||||||
color: rgba(var(--color-sdk-auxiliary), 1);
|
color: rgba(var(--color-sdk-auxiliary), 1);
|
||||||
width: 25px;
|
width: 25px;
|
||||||
@ -3537,7 +3537,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after {
|
.YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after {
|
||||||
content: "✔";
|
content: "\2714";
|
||||||
background-color: rgba(var(--color-base1), 1);
|
background-color: rgba(var(--color-base1), 1);
|
||||||
color: rgba(var(--color-sdk-auxiliary), 1);
|
color: rgba(var(--color-sdk-auxiliary), 1);
|
||||||
width: 12px;
|
width: 12px;
|
||||||
|
|||||||
@ -133,6 +133,7 @@ export const initMapData = async (type, data, cd) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
entityObject = new YJ.Obj.TrajectoryMotion(window.earth, data)
|
entityObject = new YJ.Obj.TrajectoryMotion(window.earth, data)
|
||||||
|
delete entityObject.options.reverse
|
||||||
break
|
break
|
||||||
case 'wallStereoscopic':
|
case 'wallStereoscopic':
|
||||||
entityObject = new YJ.Obj.WallStereoscopic(window.earth, data)
|
entityObject = new YJ.Obj.WallStereoscopic(window.earth, data)
|
||||||
|
|||||||
@ -711,7 +711,8 @@ const intoBack = async () => {
|
|||||||
contextIsolation: false,
|
contextIsolation: false,
|
||||||
// devTools: true,
|
// devTools: true,
|
||||||
// fullScreen: true,
|
// fullScreen: true,
|
||||||
devTools: true
|
devTools: true,
|
||||||
|
session: true // 自定义参数,用于判断是否启用session
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// `http://localhost:${availablePort}/backManage/index.html#/login?timestamp=${Date.now()}`,
|
// `http://localhost:${availablePort}/backManage/index.html#/login?timestamp=${Date.now()}`,
|
||||||
|
|||||||
@ -2,7 +2,8 @@
|
|||||||
<Dialog ref="baseDialog" :title="t('bottomMenu.groundText')" left="calc(50% - 198px)" top="calc(50% - 120px)"
|
<Dialog ref="baseDialog" :title="t('bottomMenu.groundText')" left="calc(50% - 198px)" top="calc(50% - 120px)"
|
||||||
:closeCallback="closeCallBack">
|
:closeCallback="closeCallBack">
|
||||||
<template #content>
|
<template #content>
|
||||||
<textarea style="height: 40px; width: 348px;" maxlength="80" v-model="text"></textarea>
|
<textarea style="height: 40px; width: 348px;margin-bottom: 10px;" maxlength="80" v-model="text"></textarea>
|
||||||
|
<span style="position: absolute;bottom: 66px;right: 26px;font-size: 12px;color: #c5c5c5;font-family: Arial;">{{ text.length }}/80</span>
|
||||||
</template>
|
</template>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<button @click="confirm">{{ t('btn.confirm') }}</button>
|
<button @click="confirm">{{ t('btn.confirm') }}</button>
|
||||||
|
|||||||
@ -2,7 +2,8 @@
|
|||||||
<Dialog ref="baseDialog" :title="t('bottomMenu.standText')" left="calc(50% - 198px)" top="calc(50% - 120px)"
|
<Dialog ref="baseDialog" :title="t('bottomMenu.standText')" left="calc(50% - 198px)" top="calc(50% - 120px)"
|
||||||
:closeCallback="closeCallBack">
|
:closeCallback="closeCallBack">
|
||||||
<template #content>
|
<template #content>
|
||||||
<textarea style="height: 40px; width: 348px;" maxlength="80" v-model="text"></textarea>
|
<textarea style="height: 40px; width: 348px;margin-bottom: 10px;" maxlength="80" v-model="text"></textarea>
|
||||||
|
<span style="position: absolute;bottom: 66px;right: 26px;font-size: 12px;color: #c5c5c5;font-family: Arial;">{{ text.length }}/80</span>
|
||||||
</template>
|
</template>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<button @click="confirm">{{ t('btn.confirm') }}</button>
|
<button @click="confirm">{{ t('btn.confirm') }}</button>
|
||||||
|
|||||||
@ -4,9 +4,10 @@
|
|||||||
<span class="custom-divider"></span>
|
<span class="custom-divider"></span>
|
||||||
<div class="div-item">
|
<div class="div-item">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col" style="position: relative;">
|
||||||
<span class="label">名称</span>
|
<span class="label">名称</span>
|
||||||
<textarea v-model="entityOptions.text"></textarea>
|
<textarea style="margin-bottom: 10px;" v-model="entityOptions.text"></textarea>
|
||||||
|
<span style="position: absolute;bottom: -10px;right: 2px;font-size: 12px;color: #c5c5c5;font-family: Arial;">{{ entityOptions.text.length || 0 }}/80</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<span class="label">颜色</span>
|
<span class="label">颜色</span>
|
||||||
|
|||||||
@ -265,7 +265,7 @@ const translate = () => {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
that.openPositionEditing(() => {
|
that.openPositionEditing(() => {
|
||||||
entityOptions.value.lng = structuredClone(that.options.lng)
|
entityOptions.value.lng = structuredClone(that.lng)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -348,10 +348,12 @@ const changeMaximumParticleLife = (event) => {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
const closeCallback = () => {
|
const closeCallback = async () => {
|
||||||
entityOptions.value.originalOptions = structuredClone(originalOptions)
|
entityOptions.value.originalOptions = structuredClone(originalOptions)
|
||||||
that.positionEditing = false
|
that.positionEditing = false
|
||||||
that.reset()
|
that.reset()
|
||||||
|
await YJ.Global.multiViewportMode.syncData(window.earth, that.options.id)
|
||||||
|
await YJ.Global.splitScreen.syncData(window.earth, that.options.id)
|
||||||
eventBus?.emit("destroyComponent")
|
eventBus?.emit("destroyComponent")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,9 +5,10 @@
|
|||||||
<span class="custom-divider"></span>
|
<span class="custom-divider"></span>
|
||||||
<div class="div-item">
|
<div class="div-item">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col" style="position: relative;">
|
||||||
<span class="label">名称</span>
|
<span class="label">名称</span>
|
||||||
<textarea v-model="entityOptions.text"></textarea>
|
<textarea style="margin-bottom: 10px;" maxlength="80" v-model="entityOptions.text"></textarea>
|
||||||
|
<span style="position: absolute;bottom: -10px;right: 2px;font-size: 12px;color: #c5c5c5;font-family: Arial;">{{ entityOptions.text.length || 0 }}/80</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<span class="label">颜色</span>
|
<span class="label">颜色</span>
|
||||||
|
|||||||
@ -152,25 +152,25 @@ const material = ref([
|
|||||||
name: '纯色墙',
|
name: '纯色墙',
|
||||||
value: '纯色墙',
|
value: '纯色墙',
|
||||||
key: 0,
|
key: 0,
|
||||||
icon: '../sdk/custom/img/icon-wall.png'
|
icon: '../renderer/sdk/custom/img/icon-wall.png'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '红砖墙',
|
name: '红砖墙',
|
||||||
value: '红砖墙',
|
value: '红砖墙',
|
||||||
key: 1,
|
key: 1,
|
||||||
icon: '../sdk/img/material/brick1.png'
|
icon: '../renderer/sdk/img/material/brick1.png'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '黄砖墙',
|
name: '黄砖墙',
|
||||||
value: '黄砖墙',
|
value: '黄砖墙',
|
||||||
key: 2,
|
key: 2,
|
||||||
icon: '../sdk/img/material/brick2.png'
|
icon: '../renderer/sdk/img/material/brick2.png'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '灰瓷墙',
|
name: '灰瓷墙',
|
||||||
value: '灰瓷墙',
|
value: '灰瓷墙',
|
||||||
key: 3,
|
key: 3,
|
||||||
icon: '../sdk/img/material/brick3.png'
|
icon: '../renderer/sdk/img/material/brick3.png'
|
||||||
}
|
}
|
||||||
])
|
])
|
||||||
eventBus.on("openStandTextAdd", () => {
|
eventBus.on("openStandTextAdd", () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user