Browse Source

修改bug

bill 2 years ago
parent
commit
adab6219f6

BIN
src/components/background/bg.png


+ 3 - 0
src/components/background/style.module.scss

@@ -4,5 +4,8 @@
   height: 100%;
   left: 0;
   top: 0;
+  z-index: -1;
   position: absolute !important;
+  background: url('./bg.png') no-repeat center bottom;
+  background-size: cover;
 }

+ 1 - 1
src/layout/header/index.tsx

@@ -26,7 +26,7 @@ export const HeaderContent = () => {
     <>
       <h2 className={style.title}>{title}</h2>
       <div className={style.avatar}>
-        <Dropdown overlay={<Menu items={items} />}>
+        <Dropdown overlay={<Menu style={{width: '100px'}} items={items} />} className={style['logout-drop']}>
           <div>
             <Avatar src={user.head} />
             <span className={style.username}>{user.nickName}</span>

+ 4 - 0
src/layout/header/style.module.scss

@@ -14,4 +14,8 @@
   .username {
     margin-left: 10px;
   }
+}
+
+.logout-drop {
+  max-width: 200px;
 }

+ 2 - 1
src/store/scene.ts

@@ -73,12 +73,13 @@ export const getSceneLink = (scene: Scene, flag: SceneLinkFlag): URL => {
     url.searchParams.append('modelId', scene.id)
   }
 
-  if (flag === SceneLinkFlag.edit || scene.type === SceneType.SWMX) {
+  if (flag === SceneLinkFlag.edit) {
     const token = getToken()
     token && url.searchParams.append('token', token)
   }
   if (scene.type === SceneType.SWMX) {
     url.hash = '#sign-model'
+    url.searchParams.append('share', '1')
   }
   return url
 }

+ 7 - 4
src/views/example/index.tsx

@@ -74,11 +74,14 @@ export const ExamplePage = () => {
   const [scenesCaseId, setScenesCaseId] = useState<Example['caseId'] | null>(null)
   const [fileCaseId, setFileCaseId] = useState<Example['caseId'] | null>(null)
   const [inInsert, setInInsert] = useState(false)
-  const getFuseCodeLink = (caseId: Example['caseId']) => {
-    const params = { 
-      token: getToken(),
+  const getFuseCodeLink = (caseId: Example['caseId'], query?: boolean) => {
+    const params: { token?: string, caseId: string } = { 
+      token: getToken() || undefined,
       caseId: caseId.toString()
     }
+    if (query) {
+      delete params.token
+    }
     return getHref(SceneTypeDomain[SceneType.SWMX]!, SceneTypePaths[SceneType.SWMX][0], params)
   }
   const checkScenesOpen = async (caseId: Example['caseId'], url: URL | string) => {
@@ -119,7 +122,7 @@ export const ExamplePage = () => {
           example={record}
           sceneManage={() => setScenesCaseId(record.caseId)}
           file={() => setFileCaseId(record.caseId)}
-          query={() => checkScenesOpen(record.caseId, `${getFuseCodeLink(record.caseId)}#show/summary`)}
+          query={() => checkScenesOpen(record.caseId, `${getFuseCodeLink(record.caseId, true)}&share=1#show/summary`)}
           fuse={() => checkScenesOpen(record.caseId, `${getFuseCodeLink(record.caseId)}#fuseEdit/merge`)}
           getView={() => checkScenesOpen(record.caseId, `${getFuseCodeLink(record.caseId)}#sceneEdit/view`)}
           record={() => checkScenesOpen(record.caseId, `${getFuseCodeLink(record.caseId)}#sceneEdit/record`)}