Merge remote-tracking branch 'origin/main'

frontend/src/views/system/userlogin/appframe_container.vue

@@ -120,7 +120,6 @@ const runCode = async () => {
         const component = componentModule.default || componentModule
         const dynamicProps = Vue.reactive({
             menuList: menuList.value,
-            projectName: '测试',
             applicationId: applicationId.value,
         })
         // 修改createApp方式
@@ -151,7 +150,6 @@ onMounted(() => {
     const appInfo:any = JSON.parse(localStorage.getItem('userInfo'))
     if (appInfo.id) {
         applicationId.value = appInfo.id
-        projectName.value = '测试'
         getmenuinfo()
     }
 })

frontend/src/views/system/userlogin/frame.vue

@@ -15,8 +15,6 @@ const props = defineProps({
     required: true, // 强制必须传递
     default: () => [] // 设置安全默认值
   },
-  isFixed: Boolean,
-  projectName: String,
   applicationId: String,
 })
 const navtitle: any = ref('')
@@ -124,8 +122,8 @@ const TimeDisplay = {
 }
 onMounted(() => {
   navmenulist.value = props.menuList
-  navtitle.value = props.projectName
   userList.value = JSON.parse(localStorage.getItem('userInfo'))
+  navtitle.value = userList.value.app_name
   const currentInfo:any = JSON.parse(localStorage.getItem('currentInfo'))
   if (currentInfo?.showcontent) {
     if(currentInfo.showcontent !=='FormCreate' &&  currentInfo.showcontent !=='dataVisualization'){

frontend/src/views/system/userlogin/login.vue

@@ -8,7 +8,6 @@ import { useCache } from '@/data-visualization/hooks/web/useCache'
 import { encrypt,decrypt } from '@/utils/rsaEncrypt';
 import { useUserStore } from '@/store/user'
 import { set } from 'lodash'
-const { wsCache } = useCache()
 const router = useRouter()
 const userStore = useUserStore()
 const props = defineProps({
@@ -50,7 +49,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
                     nickname: res.data.nickname,
                     username: res.data.username,
                     id: res.data.userid,
-                    appid:res.data.appid
+                    appid:res.data.appid,
+                    app_name: res.data.app_name
                 }
                 localStorage.setItem('userInfo',JSON.stringify(userInfo))
                 localStorage.setItem('token', res.data.token)
@@ -72,7 +72,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
     })
 }
 onMounted(() => {
-    loginTitle.value = props.name
+  loginTitle.value = props.name
 })
 onBeforeUnmount(() => {
 

frontend/src/views/system/userlogin/login_container.vue

@@ -175,28 +175,6 @@ onMounted(() => {
    runCode()
 })
 function init() {
-//   const paramss = { appId: route.query.id }
-//   moduleList(paramss).then(ress => {
-//     var arr = ress.data.data
-//     let list: any = {}
-//     arr.forEach((item: any) => {
-//       if (item.type == '01' && item.node_type == '02') {
-//         list = item
-//       }
-//     })
-//     if (list.id) {
-//       moduleById(list.id).then(res2 => {
-//         if (res2.data.data.canvas_style_data) {
-//           sfcCode.value = res2.data.data.canvas_style_data
-//           runCode()
-//         }
-//       })
-//     }else{
-//       sfcCode.value = defaultTemplate
-//       runCode()
-//     }
-//   })
-
 }
 onBeforeUnmount(() => {