Merge remote-tracking branch 'origin/master'

src/core/engine/SceneHelp.ts

@@ -81,14 +81,15 @@ export default class SceneHelp {
     this.scene.add(hemisphereLight)
 
     // 完全不透明的地板
-    // const geometry = new THREE.PlaneGeometry(gridOption.gridSize, gridOption.gridSize)
-    // const material = new THREE.MeshBasicMaterial({
-    //   color: '#ffffff',
-    //   side: THREE.BackSide
-    // })
-    // const ground = new THREE.Mesh(geometry, material)
-    // ground.rotation.x = -Math.PI / 2
-    // this.scene.add(ground)
+    const geometry = new THREE.PlaneGeometry(gridOption.gridSize, gridOption.gridSize)
+    const material = new THREE.MeshBasicMaterial({
+      color: '#ffffff',
+      side: THREE.BackSide
+    })
+    const ground = new THREE.Mesh(geometry, material)
+    ground.rotation.x = Math.PI / 2
+    ground.position.y = -0.01
+    this.scene.add(ground)
 
     // const directionalLight = new THREE.DirectionalLight(0xffffff, 1.5)
     // directionalLight.position.set(5, 5, 5).multiplyScalar(3)

src/core/script/LCCScript.ts

@@ -93,13 +93,12 @@ export default class LCCScript implements LCC {
   }
 
   saveAndSyncScripts(scriptList: { name: string; content: string }[]): Promise<ServerResponse<{ name: string; content: string }[]>> {
-    if (!worldModel.state.project_uuid || !worldModel.state.runState.currentEnvId) {
+    if (!worldModel.state.project_uuid) {
       return Promise.reject(new Error('Project UUID or Environment ID is not set.'))
     }
 
     return Request.request.post('/api/workbench/LccController@saveAndSyncScripts', {
       projectUUID: worldModel.state.project_uuid,
-      envId: worldModel.state.runState.currentEnvId,
       scriptList: scriptList
     })
   }

src/views/Header.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header-wrapper">
     <div class="left">
-      <div class="logo"><img :src="Logo" alt="" style="height: 30px;width: 169px"></div>
+      <div class="logo"><img :src="LogoZh" alt="" style="height: 30px;width: 169px"></div>
       <span class="menu-icon" @click="handleToggle">
         <!-- 使用 props.collapsed -->
         <component v-if="!props.collapsed" :is="renderIcon('antd MenuFoldOutlined')"></component>
@@ -20,6 +20,7 @@
 import {ref} from 'vue'
 import { renderIcon } from '@/utils/webutils.js'
 import Logo from '@/assets/images/logo.png'
+import LogoZh from '@/assets/images/logo_zh.png'
 // 接收 props
 const props = defineProps({
   isMobile: Boolean,

src/views/inventory/query.vue

@@ -135,7 +135,7 @@ function serverSideDatasource(params: IServerSideGetRowsParams) {
             class="query-form flex-item-fixed"
             :data="state.queryData"
             :formFields="data.formFields"
-            :columnCount="2"
+            :columnCount="4"
             layout="bothFixed"
             labelWidth="85px"
             inputWidth="200px"