Merge branch 'release/V1.2.0/test' into release/V2.0.0/test

.env.base

@@ -22,7 +22,7 @@ VITE_APP_TITLE='灵客管理后台'
 VITE_USE_ALL_ELEMENT_PLUS_STYLE=true
 
 # 是否开启mock
-VITE_USE_MOCK=true
+VITE_USE_MOCK=false
 
 # 是否使用在线图标
 VITE_USE_ONLINE_ICON=true

.env.gitee

@@ -29,7 +29,7 @@ VITE_USE_BUNDLE_ANALYZER=false
 VITE_USE_ALL_ELEMENT_PLUS_STYLE=false
 
 # 是否开启mock
-VITE_USE_MOCK=true
+VITE_USE_MOCK=false
 
 # 是否切割css
 VITE_USE_CSS_SPLIT=true

.env.pro

@@ -36,7 +36,7 @@ VITE_USE_BUNDLE_ANALYZER=true
 VITE_USE_ALL_ELEMENT_PLUS_STYLE=false
 
 # 是否开启mock
-VITE_USE_MOCK=true
+VITE_USE_MOCK=false
 
 # 是否切割css
 VITE_USE_CSS_SPLIT=true

mock/_createProductionServer.ts

@@ -1,18 +0,0 @@
-import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer'
-
-const modules = import.meta.glob('./**/*.mock.ts', {
-  import: 'default',
-  eager: true
-})
-
-const mockModules: any[] = []
-Object.keys(modules).forEach(async (key) => {
-  if (key.includes('_')) {
-    return
-  }
-  mockModules.push(...(modules[key] as any))
-})
-
-export function setupProdMockServer() {
-  createProdMockServer(mockModules)
-}

mock/role/index.mock.ts

@@ -1,150 +0,0 @@
-/*
- * @Author: 半生瓜 1515706227@qq.com
- * @Date: 2024-04-21 17:20:21
- * @LastEditors: 半生瓜 1515706227@qq.com
- * @LastEditTime: 2024-05-07 15:55:12
- * @FilePath: \vue-element-plus-admin-mini\mock\role\index.mock.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import { MockMethod } from 'vite-plugin-mock'
-import { SUCCESS_CODE } from '@/constants'
-
-const timeout = 1000
-
-const adminList = [
-  {
-    path: '/Template',
-    component: '#',
-    redirect: '/Template/TemplateManage',
-    name: 'Template',
-    meta: {
-      title: 'router.level',
-    },
-    children: [
-      {
-        path: 'TemplateManage',
-        name: 'TemplateManage',
-        component: 'views/Template/TemplateManage',
-        meta: {
-          title: '模板管理',
-          icon: 'ant-design:dashboard-filled',
-        }
-      }
-    ]
-  },
-  {
-    path: '/Resource',
-    component: '#',
-    redirect: '/Resource/ResourceManage',
-    name: 'Resource',
-    meta: {
-      title: 'router.level'
-    },
-    children: [
-      {
-        path: 'ResourceManage',
-        name: 'ResourceManage',
-        component: 'views/Resource/ResourceManage',
-        meta: {
-          title: '资源管理',
-          icon: 'carbon:skill-level-advanced'   
-        }
-      }
-    ]
-  },
-  {
-    path: '/Audit',
-    component: '#',
-    redirect: '/Audit/AuditManage',
-    name: 'Audit',
-    meta: {
-      title: '审核管理',
-    },
-    children: [
-      {
-        path: 'AuditManage',
-        name: 'AuditManage',
-        component: 'views/Audit/AuditManage',
-        meta: {
-          icon: 'ri:function-fill',
-          title: '审核管理'
-        }
-      }
-    ]
-  },
-  {
-    path: '/Authority',
-    component: '#',
-    redirect: '/Authority/AuditManage',
-    name: 'Authority',
-    meta: {
-      title: '权限管理',
-      icon: 'eos-icons:role-binding',
-    },
-    children: [
-      {
-        path: 'User',
-        name: 'User',
-        component: 'views/Authority/User',
-        meta: {
-          title: '用户管理'
-        }
-      },
-      {
-        path: 'Role',
-        name: 'Role',
-        component: 'views/Authority/Role',
-        meta: {
-          title: '角色管理'
-        }
-      },
-    ]
-  },
-  {
-    path: '/System',
-    component: '#',
-    redirect: '/System/SystemSetting',
-    name: 'System',
-    meta: {
-      title: '系统设置',
-    },
-    children: [
-      {
-        path: 'SystemSetting',
-        name: 'SystemSetting',
-        component: 'views/System/SystemSetting',
-        meta: {
-          icon: 'ic:outline-webhook',
-          title: '系统设置'
-        }
-      }
-    ]
-  }
-]
-
-const testList: string[] = [
-  '/level',
-  '/zy',
-  '/zy/Menu12',
-  '/level/menu1',
-  '/level/menu1/menu1-1',
-  '/level/menu1/menu1-1/menu1-1-1',
-  '/level/menu1/menu1-2',
-  '/level/menu2'
-]
-
-export default [
-  // 列表接口
-  {
-    url: '/mock/role/list',
-    method: 'get',
-    timeout,
-    response: ({ query }) => {
-      const { roleName } = query
-      return {
-        code: SUCCESS_CODE,
-        data: roleName === 'admin' ? adminList : testList
-      }
-    }
-  }
-] as MockMethod[]

mock/table/index.mock.ts

@@ -1,249 +0,0 @@
-import Mock from 'mockjs'
-import { SUCCESS_CODE } from '@/constants'
-import { toAnyString } from '@/utils'
-
-const timeout = 1000
-const count = 100
-
-const baseContent =
-  '<p>I am testing data, I am testing data.</p><p><img src="https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943"></p>'
-
-interface ListProps {
-  id: string
-  author: string
-  title: string
-  content: string
-  importance: number
-  display_time: any
-  pageviews: number
-  image_uri: string
-  video_uri?: string
-}
-
-interface TreeListProps {
-  id: string
-  author: string
-  title: string
-  content: string
-  importance: number
-  display_time: any
-  image_uri: string
-  pageviews: number
-  video_uri?: string
-  children?: TreeListProps[]
-}
-
-let List: ListProps[] = []
-
-for (let i = 0; i < count; i++) {
-  List.push(
-    Mock.mock({
-      id: toAnyString(),
-      // timestamp: +Mock.Random.date('T'),
-      author: '@first',
-      title: '@title(5, 10)',
-      content: baseContent,
-      importance: '@integer(1, 3)',
-      display_time: '@datetime',
-      pageviews: '@integer(100, 500)',
-      image_uri: Mock.Random.image('@integer(100, 500)x@integer(100, 500)'),
-      video_uri:
-        '//sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-720p.mp4'
-    })
-  )
-}
-
-const treeList: TreeListProps[] = []
-
-for (let i = 0; i < count; i++) {
-  treeList.push(
-    Mock.mock({
-      id: toAnyString(),
-      // timestamp: +Mock.Random.date('T'),
-      author: '@first',
-      title: '@title(5, 10)',
-      content: baseContent,
-      importance: '@integer(1, 3)',
-      display_time: '@datetime',
-      pageviews: '@integer(300, 5000)',
-      image_uri: Mock.Random.image('@integer(100, 500)x@integer(100, 500)'),
-      // image_uri
-    })
-  )
-}
-
-const cardList = [
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
-    name: 'Alipay',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  },
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png',
-    name: 'Angular',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  },
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png',
-    name: 'Bootstrap',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  },
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/kZzEzemZyKLKFsojXItE.png',
-    name: 'React',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  },
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/ComBAopevLwENQdKWiIn.png',
-    name: 'Vue',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  },
-  {
-    logo: 'https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png',
-    name: 'Webpack',
-    desc: '在中台产品的研发过程中，会出现不同的设计规范和实现方式，但其中往往存在很多类似的页面和组件，这些类似的组件会被抽离成一套标准规范。'
-  }
-]
-
-export default [
-  // 树形列表接口
-  {
-    url: '/mock/example/treeList',
-    method: 'get',
-    timeout,
-    response: ({ query }) => {
-      const { title, pageIndex, pageSize } = query
-      const mockList = treeList.filter((item) => {
-        if (title && item.title.indexOf(title) < 0) return false
-        return true
-      })
-      const pageList = mockList.filter(
-        (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1)
-      )
-      return {
-        code: SUCCESS_CODE,
-        data: {
-          total: mockList.length,
-          list: pageList
-        }
-      }
-    }
-  },
-  // 列表接口
-  {
-    url: '/mock/example/list',
-    method: 'get',
-    timeout,
-    response: ({ query }) => {
-      const { title, pageIndex, pageSize } = query
-      const mockList = List.filter((item) => {
-        if (title && item.title.indexOf(title) < 0) return false
-        return true
-      })
-      const pageList = mockList.filter(
-        (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1)
-      )
-      return {
-        code: SUCCESS_CODE,
-        data: {
-          total: mockList.length,
-          list: pageList
-        }
-      }
-    }
-  },
-  // 保存接口
-  {
-    url: '/mock/example/save',
-    method: 'post',
-    timeout,
-    response: ({ body }) => {
-      if (!body.id) {
-        List = [
-          Object.assign(body, {
-            id: toAnyString()
-          })
-        ].concat(List)
-        return {
-          code: SUCCESS_CODE,
-          data: 'success'
-        }
-      } else {
-        List.map((item) => {
-          if (item.id === body.id) {
-            for (const key in item) {
-              item[key] = body[key]
-            }
-          }
-        })
-        return {
-          code: SUCCESS_CODE,
-          data: 'success'
-        }
-      }
-    }
-  },
-  // 详情接口
-  {
-    url: '/mock/example/detail',
-    method: 'get',
-    response: ({ query }) => {
-      const { id } = query
-      for (const example of List) {
-        if (example.id === id) {
-          return {
-            code: SUCCESS_CODE,
-            data: example
-          }
-        }
-      }
-    }
-  },
-  // 删除接口
-  {
-    url: '/mock/example/delete',
-    method: 'post',
-    response: ({ body }) => {
-      const ids = body.ids
-      if (!ids) {
-        return {
-          code: 500,
-          message: '请选择需要删除的数据'
-        }
-      } else {
-        let i = List.length
-        while (i--) {
-          if (ids.indexOf(List[i].id) !== -1) {
-            List.splice(i, 1)
-          }
-        }
-        return {
-          code: SUCCESS_CODE,
-          data: 'success'
-        }
-      }
-    }
-  },
-  {
-    url: '/mock/card/list',
-    method: 'get',
-    timeout,
-    response: ({ query }) => {
-      const { name, pageIndex, pageSize } = query
-      const mockList = cardList.filter((item) => {
-        if (name && item.name.indexOf(name) < 0) return false
-        return true
-      })
-      const pageList = mockList.filter(
-        (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1)
-      )
-      return {
-        code: SUCCESS_CODE,
-        data: {
-          total: mockList.length,
-          list: pageList
-        }
-      }
-    }
-  }
-]

mock/user/index.mock.ts

@@ -1,90 +0,0 @@
-import { SUCCESS_CODE } from '@/constants'
-
-const timeout = 1000
-
-const List: {
-  username: string
-  password: string
-  role: string
-  roleId: string
-  permissions: string | string[]
-}[] = [
-  {
-    username: 'admin',
-    password: 'admin',
-    role: 'admin',
-    roleId: '1',
-    permissions: ['*.*.*']
-  },
-  {
-    username: 'test',
-    password: 'test',
-    role: 'test',
-    roleId: '2',
-    permissions: ['example:dialog:create', 'example:dialog:delete']
-  }
-]
-
-export default [
-  // 列表接口
-  {
-    url: '/mock/user/list',
-    method: 'get',
-    response: ({ query }) => {
-      const { username, pageIndex, pageSize } = query
-
-      const mockList = List.filter((item) => {
-        if (username && item.username.indexOf(username) < 0) return false
-        return true
-      })
-      const pageList = mockList.filter(
-        (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1)
-      )
-
-      return {
-        code: SUCCESS_CODE,
-        data: {
-          total: mockList.length,
-          list: pageList
-        }
-      }
-    }
-  },
-  // 登录接口
-  {
-    url: '/mock/user/login',
-    method: 'post',
-    timeout,
-    response: ({ body }) => {
-      const data = body
-      let hasUser = false
-      for (const user of List) {
-        if (user.username === data.username && user.password === data.password) {
-          hasUser = true
-          return {
-            code: SUCCESS_CODE,
-            data: user
-          }
-        }
-      }
-      if (!hasUser) {
-        return {
-          code: 500,
-          message: '账号或密码错误'
-        }
-      }
-    }
-  },
-  // 退出接口
-  {
-    url: '/mock/user/loginOut',
-    method: 'get',
-    timeout,
-    response: () => {
-      return {
-        code: SUCCESS_CODE,
-        data: null
-      }
-    }
-  }
-]

src/api/System/index.ts

@@ -9,18 +9,6 @@
 import request from '@/axios'
 import type { TableData } from './types'
 
-export const getTableListApi = (params: any) => {
-  return request.get({ url: '/mock/example/list', params })
-}
-
-export const getCardTableListApi = (params: any) => {
-  return request.get({ url: '/mock/card/list', params })
-}
-
-export const getTreeTableListApi = (params: any) => {
-  return request.get({ url: '/mock/example/treeList', params })
-}
-
 //查询全部产品配置参数接口
 export const getSystem = () => {
   return request.post({ url: '/config/manage/all' })
@@ -47,15 +35,3 @@ export const saveSystem = (params: any) => {
 export const deleteBulletin = (params: any) => {
   return request.post({ url: '/bulletin/manage/delete', params })
 }
-
-export const saveTableApi = (data: Partial<TableData>): Promise<IResponse> => {
-  return request.post({ url: '/mock/example/save', data })
-}
-
-export const getTableDetApi = (id: string): Promise<IResponse<TableData>> => {
-  return request.get({ url: '/mock/example/detail', params: { id } })
-}
-
-export const delTableListApi = (ids: string[] | number[]): Promise<IResponse> => {
-  return request.post({ url: '/mock/example/delete', data: { ids } })
-}

src/api/login/index.ts

@@ -17,18 +17,10 @@ export const loginApi = (data): Promise<IResponse> => {
   return request.post({ url: '/jwt/token', data })
 }
 
-export const loginOutApi = (): Promise<IResponse> => {
-  return request.get({ url: '/mock/user/loginOut' })
-}
-
 export const getAdminRoleApi = (): Promise<IResponse<AppCustomRouteRecordRaw[]>> => {
   return request.post({ url: '/user/authList' })
 }
 
-export const getTestRoleApi = (params: RoleParams): Promise<IResponse<string[]>> => {
-  return request.get({ url: '/mock/role/list2', params })
-}
-
 export const getRsaKey = (): Promise<IResponse> => {
   return request.post({ url: '/encrypt/rsaKey' })
 }

src/api/material/index.ts

@@ -11,7 +11,6 @@ import request from '@/axios'
 //资源管理分页接口
 export const getMaterial = (params: any) => {
   params.page = params.page - 1
-  params.materialType = 1
   return request.post({ url: '/material/pageQuery', params })
 }
 
@@ -22,7 +21,6 @@ export const upIcon = (params: any) => {
 
 //保存材质接口
 export const saveResource = (params: any) => {
-  params.materialType = 1
   return request.post({ url: '/material/save', data: params })
 }
 //批量保存材质接口

src/components/Editor/src/Editor.vue

@@ -10,10 +10,17 @@ import { useLocaleStore } from '@/store/modules/locale'
 
 const userStore = useUserStore()
 const token = userStore.getToken
-const Authorization = `Bearer ${token}`
-
 const localeStore = useLocaleStore()
-const headers = ref({ Authorization: Authorization })
+
+const Authorization = ref(`Bearer ${userStore.getToken}`)
+const headers = ref({ Authorization: Authorization.value })
+
+setInterval(() => {
+  Authorization.value = `Bearer ${userStore.getToken}`
+  console.log('Authorization', Authorization.value)
+  headers.value = { Authorization: Authorization.value }
+}, 6000) //
+
 const currentLocale = computed(() => localeStore.getCurrentLocale)
 
 i18nChangeLanguage(unref(currentLocale).lang)

src/views/Audit/AuditManage.vue

@@ -120,7 +120,11 @@ const deletetab = async (data: TableSlotDefault) => {
     const res = await deleteAudit(arr)
     refresh()
     if (res.code == 200) {
-      ElMessage.success('删除成功')
+      if (res.message.includes('成功')) {
+        ElMessage.success(res.message)
+      } else {
+        ElMessage.error(res.message)
+      }
     }
     refresh()
   })
@@ -145,7 +149,11 @@ const getSelections = async () => {
         const res = await deleteAudit(arr)
         console.log('kkkkkkss', res)
         if (res.code == 200) {
-          ElMessage.success('删除成功')
+          if (res.message.includes('成功')) {
+            ElMessage.success(res.message)
+          } else {
+            ElMessage.error(res.message)
+          }
         }
         refresh()
       })

src/views/Authority/Role.vue

@@ -148,6 +148,9 @@ const editRole = async (data) => {
     morenxz.push(item)
   })
   console.log('sssssa', morenxz)
+    morenxz.push(item)
+  })
+  console.log('sssssa', morenxz)
 
   tianjia().then(async () => {
     const formData = await getFormData()
@@ -207,7 +210,8 @@ const tianjia = async () => {
       let a1 = {
         label: item.name,
         id: item.id,
-        value: item.id
+        value: item.id,
+        childrenid: item.children[0].id
       }
       transformedData.push(a1)
     } else {
@@ -230,6 +234,8 @@ const tianjia = async () => {
   data = transformedData
   console.log('sadas22d', data)
 
+  console.log('sadas22d', data)
+
   isshow.value = false
 }
 
@@ -334,7 +340,9 @@ const send = (a, b) => {
   query.authorityList = []
   b.checkedNodes.map((item) => {
     query.authorityList.push(item.value)
+    query.authorityList.push(item.childrenid)
     query2.authorityList.push(item.value)
+    query2.authorityList.push(item.childrenid)
   })
 }
 

src/views/Login/components/LoginForm.vue

@@ -12,14 +12,7 @@ import { Form, FormSchema } from '@/components/Form'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElCheckbox, ElLink, ElMessage } from 'element-plus'
 import { useForm } from '@/hooks/web/useForm'
-import {
-  loginApi,
-  getRsaKey,
-  getTestRoleApi,
-  getAdminRoleApi,
-  getRefreshToken,
-  getuesrinfo
-} from '@/api/login'
+import { loginApi, getRsaKey, getAdminRoleApi, getRefreshToken, getuesrinfo } from '@/api/login'
 import { useAppStore } from '@/store/modules/app'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRouter } from 'vue-router'
@@ -77,7 +70,7 @@ const schema = reactive<FormSchema[]>([
       span: 24
     },
     componentProps: {
-      placeholder: '请输入用户名',
+      placeholder: '请输入账号',
       prefixIcon: <Icon icon="mdi:account" />
     }
   },
@@ -219,7 +212,7 @@ const signIn = async () => {
               if (item.configKey == 'jarVersion') {
                 a1 = item
                 a1.configValue = JSON.parse(a1.configValue)
-                a1.configValue.manger = 'V1.0.0.20240606'
+                a1.configValue.manger = 'V1.1.0.20250208'
                 a1.configValue = JSON.stringify(a1.configValue)
 
                 saveSystem([a1]).then(() => {})
@@ -271,7 +264,7 @@ const getRole = async () => {
   const res =
     appStore.getDynamicRouter && appStore.getServerDynamicRouter
       ? await getAdminRoleApi()
-      : await getTestRoleApi(params)
+      : await getAdminRoleApi()
   if (res) {
     if (res.data.length > 0) {
       console.log('kankan....', res.data)

src/views/Material/MaterialMange.vue

@@ -7,7 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <script setup lang="tsx">
-import { ElInput } from 'element-plus'
+import { ElInput, ElSelect, ElOption } from 'element-plus'
 import { ref } from 'vue'
 import { Dialog } from '@/components/Dialog'
 import { ContentWrap } from '@/components/ContentWrap'
@@ -25,10 +25,13 @@ import { useForm } from '@/hooks/web/useForm'
 import { BaseButton } from '@/components/Button'
 import { useUserStore } from '@/store/modules/user'
 import { log } from 'console'
+import { json } from 'stream/consumers'
 const PATH_URL = window.VITE_API_BASE_PATH
-
+const tietu = ref('')
 const { required } = useValidator()
 const text = ref('')
+const materialType = ref('')
+
 const userStore = useUserStore()
 defineOptions({
   name: 'TemplateManage'
@@ -40,7 +43,8 @@ const { tableRegister, tableState, tableMethods } = useTable({
     const res = await getMaterial({
       page: unref(currentPage),
       pageSize: unref(pageSize),
-      name: unref(text)
+      name: unref(text),
+      materialType: unref(materialType)
     })
     res.data.content.map((item) => {
       item.materialIcon = PATH_URL + item.materialIcon
@@ -72,6 +76,17 @@ const columns = reactive<TableColumn[]>([
     type: 'index'
   },
   {
+    field: 'materialName',
+    label: '材质名称'
+  },
+  {
+    field: 'materialType',
+    label: '材质类型',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue === 1 ? '贴图' : cellValue === 2 ? '颜色' : ''
+    }
+  },
+  {
     field: 'icon',
     label: '图标'
   },
@@ -95,6 +110,7 @@ const columns = reactive<TableColumn[]>([
   }
 ])
 const imageUrl = ref('')
+const imageUrl2 = ref('')
 const isedit = ref('添加')
 //删除
 const deletetab = async (data: TableSlotDefault) => {
@@ -119,15 +135,62 @@ const deletetab = async (data: TableSlotDefault) => {
 const dialogVisible = ref(false)
 const dialogVisible2 = ref(false)
 
-const token = userStore.getToken
-const Authorization = `Bearer ${token}`
-const headers = ref({ Authorization: Authorization })
+const Authorization = ref(`Bearer ${userStore.getToken}`)
+const headers = ref({ Authorization: Authorization.value })
+
+setInterval(() => {
+  Authorization.value = `Bearer ${userStore.getToken}`
+  console.log('Authorization', Authorization.value)
+  headers.value = { Authorization: Authorization.value }
+}, 6000) //
 
 const { formRegister, formMethods } = useForm()
 const { getElFormExpose, getFormData } = formMethods
 
 const schema = reactive<FormSchema[]>([
   {
+    field: 'materialType',
+    label: '材质类型',
+    component: 'Select',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      options: [
+        { label: '贴图', value: 1 },
+        { label: '颜色', value: 2 }
+      ],
+      placeholder: '请选择材质类型',
+      onChange: (value) => {
+        if (value === 2) {
+          schema.find((item) => item.field === 'TIETU').colProps.span = 0
+        } else {
+          schema.find((item) => item.field === 'TIETU').colProps.span = 24
+        }
+      }
+    },
+    formItemProps: {
+      rules: [required()]
+    }
+  },
+  {
+    field: 'materialName',
+    label: '材质名称',
+    component: 'Input',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      style: {
+        width: '100%'
+      },
+      placeholder: '请输入材质名称'
+    },
+    formItemProps: {
+      rules: [required()]
+    }
+  },
+  {
     field: 'materialIcon',
     component: 'Upload',
     colProps: {
@@ -147,11 +210,17 @@ const schema = reactive<FormSchema[]>([
         formData.materialIcon = _response.data
       },
       beforeUpload: (rawFile) => {
+        console.log('sadghasgdaj', rawFile.name.includes('jpeg'))
         console.log('kankangeshi', rawFile)
+        if (rawFile.name.includes('jpeg')) {
+          ElMessage.error('上传格式：png、jpg!')
+          return false
+        }
         if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
           ElMessage.error('上传格式：png、jpg!')
           return false
         }
+
         return true
       },
       slots: {
@@ -170,50 +239,68 @@ const schema = reactive<FormSchema[]>([
     }
   },
   {
-    field: 'jsonPath',
+    field: 'TIETU',
     component: 'Upload',
-    label: '材质内容',
     colProps: {
       span: 24
     },
+    label: '贴图图片',
+    formItemProps: {},
     componentProps: {
-      limit: 1,
-      action: PATH_URL + '/resource/v1/addJsonFile',
+      action: PATH_URL + '/resource/manage/uploadImg',
       headers: headers,
-      fileList: [],
-      multiple: true,
-      onPreview: (uploadFile) => {
-        console.log(uploadFile)
-      },
-      onRemove: async (file) => {
-        const formData = await getFormData()
-        formData.jsonPath = ''
-        formData.compressFileName = ''
-        formData.uploadCompress = false
-      },
+      showFileList: false,
       onSuccess: async (_response, uploadFile) => {
-        console.log('kankan_response', uploadFile)
+        imageUrl2.value = URL.createObjectURL(uploadFile.raw!)
         const formData = await getFormData()
-        formData.jsonPath = _response.data
-        formData.compressFileName = uploadFile.name
-      },
-      beforeRemove: (uploadFile) => {},
-      onExceed: (files, uploadFiles) => {
-        ElMessage.warning('只能上传一个资源，请移除后重新上传')
+        formData.TIETU = _response.data
+        console.log('asdhjasdkj', formData)
       },
       beforeUpload: (rawFile) => {
-        console.log('kokokoko', rawFile)
-        // if (rawFile.type !== 'application/x-zip-compressed' && rawFile.name.indexOf('.rar') == -1) {
-        //   ElMessage.error('只能上传RAR、ZIP文件')
-        //   return false
-        // }
-        // return true
+        console.log('sadghasgdaj', rawFile.name.includes('jpeg'))
+        console.log('kankangeshi', rawFile)
+        if (rawFile.name.includes('jpeg')) {
+          ElMessage.error('上传格式：png、jpg!')
+          return false
+        }
+        if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
+          ElMessage.error('上传格式：png、jpg!')
+          return false
+        }
+
+        return true
       },
       slots: {
-        default: () => <BaseButton type="primary">点击上传</BaseButton>,
-        tip: () => <div class="el-upload__tip">文件类型：JSON</div>
+        default: () => (
+          <>
+            {imageUrl2.value ? <img src={imageUrl2.value} class="avatar" /> : null}
+            {!imageUrl2.value ? (
+              <ElIcon class="avatar-uploader-icon" size="large" style="font-size: 50px">
+                +
+              </ElIcon>
+            ) : null}
+          </>
+        ),
+        tip: () => <div class="el-upload__tip">上传格式：png、jpg，大小：56x56px；</div>
       }
     }
+  },
+  {
+    field: 'jsonValue',
+    label: '材质内容',
+    component: 'Input',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      type: 'textarea',
+      rows: 4,
+      placeholder: '请输入材质内容'
+    },
+
+    formItemProps: {
+      rules: [required()]
+    }
   }
 ])
 const schema2 = reactive<FormSchema[]>([
@@ -272,10 +359,21 @@ const edittab = async (data: TableSlotDefault) => {
   const formData = await getFormData()
   formData.compressFileName = data.row.compressFileName
   formData.jsonPath = data.row.jsonPath
+  formData.TIETU = data.row.jsonValue.texture
+
   formData.materialName = data.row.materialName
 
+  let a = JSON.parse(JSON.stringify(data.row.jsonValue))
+  tietu.value = a.texture
+  imageUrl2.value = PATH_URL + data.row.jsonValue.texture
+  delete a.texture
+  formData.jsonValue = JSON.stringify(a)
+
+  formData.materialType = data.row.materialType
+
   formData.materialIcon = data.row.materialIcon.replace(PATH_URL, '')
   imageUrl.value = data.row.materialIcon
+
   formData.materialId = data.row.materialId
   schema[1].componentProps.fileList = [
     {
@@ -283,20 +381,52 @@ const edittab = async (data: TableSlotDefault) => {
       url: data.row.jsonPath
     }
   ]
+
+  // 如果材质类型是颜色，不显示贴图图标
+  if (formData.materialType === 2) {
+    schema.find((item) => item.field === 'TIETU').colProps.span = 0
+  } else {
+    schema.find((item) => item.field === 'TIETU').colProps.span = 24
+  }
 }
 // 添加编辑模板管理
 const signIn = async () => {
   const formRef = await getElFormExpose()
   const formData = await getFormData()
+  console.log('asdhajgsh', formData.jsonValue)
+
+  if (!formData.TIETU && formData.materialType == 1) {
+    ElMessage.warning('请上传贴图图标')
+    return
+  }
+
+  try {
+    formData.jsonValue = JSON.parse(formData.jsonValue)
+  } catch (error) {
+    ElMessage.error('材质内容格式错误')
+    return
+  }
 
+  console.log('shdjasd1', formData.TIETU)
+  if (formData.TIETU) {
+    formData.jsonValue.texture = formData.TIETU
+  } else {
+    formData.jsonValue.texture = tietu.value
+  }
   //如果是编辑去掉icon的拼接
   console.log('kakkkkak', formData)
   await formRef?.validate(async (isValid) => {
     if (isValid) {
       const res = await saveResource(formData)
+      console.log('shdjasd22', res)
       if (res) {
         dialogVisible.value = false
+        ElMessage.success('保存成功')
         refresh()
+      } else {
+        console.log('asdhjasd')
+        delete formData.jsonValue.texture
+        formData.jsonValue = JSON.stringify(formData.jsonValue)
       }
     }
   })
@@ -350,23 +480,69 @@ const getSelections = async () => {
     ElMessage.warning('请选择数据')
   }
 }
+
+const options = [
+  {
+    value: 1,
+    label: '贴图'
+  },
+  {
+    value: 2,
+    label: '颜色'
+  }
+]
+
+//搜索
+const handersearch = function () {
+  tableState.currentPage.value = 1
+  refresh()
+}
+
 const tianjia = async () => {
   imageUrl.value = ''
+  imageUrl2.value = ''
   isedit.value = '添加'
   schema[1].componentProps.fileList = []
   dialogVisible.value = true
 }
-const batchtianjia = async () => {
-  dialogVisible2.value = true
-}
 </script>
 
 <template>
   <ContentWrap>
     <div style="margin-bottom: 10px">
+      <span style="color: #606266"> 材质名称：</span>
+      <el-input
+        v-model="text"
+        style="width: 200px; height: 43px; margin: 7px"
+        placeholder="请输入材质名称"
+      />
+      <span style="color: #606266"> 材质状态：</span>
+      <el-select
+        v-model="materialType"
+        clearable
+        placeholder="全部"
+        size="large"
+        style="width: 240px"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+
+      <ElButton
+        style="margin-left: 20px"
+        type="primary"
+        size="large"
+        @click="handersearch"
+        :icon="Search"
+        >搜索</ElButton
+      >
+
       <ElButton type="success" size="large" @click="tianjia" :icon="Edit">添加</ElButton>
       <ElButton type="danger" size="large" @click="getSelections" :icon="Delete">删除</ElButton>
-      <ElButton type="success" size="large" @click="batchtianjia" :icon="Edit">批量上传</ElButton>
     </div>
 
     <Table
@@ -388,7 +564,7 @@ const batchtianjia = async () => {
     />
   </ContentWrap>
 
-  <Dialog v-model="dialogVisible" maxHeight="390px" width="35rem" :title="isedit">
+  <Dialog v-model="dialogVisible" maxHeight="580px" width="35rem" :title="isedit">
     <Form :schema="schema" @register="formRegister" />
     <template #footer>
       <div style="width: 100%; display: flex; justify-content: center">

src/views/Resource/ResourceManage.vue

@@ -127,9 +127,14 @@ const deletetab = async (data: TableSlotDefault) => {
 
 const dialogVisible = ref(false)
 
-const token = userStore.getToken
-const Authorization = `Bearer ${token}`
-const headers = ref({ Authorization: Authorization })
+const Authorization = ref(`Bearer ${userStore.getToken}`)
+const headers = ref({ Authorization: Authorization.value })
+
+setInterval(() => {
+  Authorization.value = `Bearer ${userStore.getToken}`
+  console.log('Authorization', Authorization.value)
+  headers.value = { Authorization: Authorization.value }
+}, 6000) // 每60秒更新一次token
 
 const { formRegister, formMethods } = useForm()
 const { getElFormExpose, getFormData } = formMethods
@@ -228,7 +233,7 @@ const schema = reactive<FormSchema[]>([
       },
       beforeUpload: (rawFile) => {
         console.log('kokokoko', rawFile)
-        if (rawFile.type !== 'application/x-zip-compressed' && rawFile.name.indexOf('.rar') == -1) {
+        if (rawFile.name.indexOf('.zip') == -1 && rawFile.name.indexOf('.rar') == -1) {
           ElMessage.error('只能上传RAR、ZIP文件')
           return false
         }

src/views/System/SystemSetting.vue

@@ -33,9 +33,17 @@ import { any } from 'vue-types'
 import { useTable } from '@/hooks/web/useTable'
 const userStore = useUserStore()
 const token = userStore.getToken
-const Authorization = `Bearer ${token}`
+
 import type { UploadProps } from 'element-plus'
-const headers = ref({ Authorization: Authorization })
+
+const Authorization = ref(`Bearer ${userStore.getToken}`)
+const headers = ref({ Authorization: Authorization.value })
+
+setInterval(() => {
+  Authorization.value = `Bearer ${userStore.getToken}`
+  console.log('Authorization', Authorization.value)
+  headers.value = { Authorization: Authorization.value }
+}, 6000) //
 const PATH_URL = window.VITE_API_BASE_PATH + '/config/manage/uploadImg'
 const IMG_URL = window.VITE_API_BASE_PATH
 const { required, lengthRange } = useValidator()

src/views/Template/TemplateManage.vue

@@ -115,9 +115,14 @@ const deletetab = async (data: TableSlotDefault) => {
 
 const dialogVisible = ref(false)
 
-const token = userStore.getToken
-const Authorization = `Bearer ${token}`
-const headers = ref({ Authorization: Authorization })
+const Authorization = ref(`Bearer ${userStore.getToken}`)
+const headers = ref({ Authorization: Authorization.value })
+
+setInterval(() => {
+  Authorization.value = `Bearer ${userStore.getToken}`
+  console.log('Authorization', Authorization.value)
+  headers.value = { Authorization: Authorization.value }
+}, 6000) //
 
 const { formRegister, formMethods } = useForm()
 const { getElFormExpose, getFormData } = formMethods
@@ -140,6 +145,31 @@ const schema = reactive<FormSchema[]>([
       rules: [required()]
     }
   },
+
+  {
+    field: 'typeNumber',
+    label: '模板内容',
+    component: 'Select',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      options: [
+        {
+          value: 1,
+          label: '不含pak包'
+        },
+        {
+          value: 2,
+          label: '含pak包'
+        }
+      ],
+      slots: {}
+    },
+    formItemProps: {
+      rules: [required()]
+    }
+  },
   {
     field: 'thumbnail',
     component: 'Upload',
@@ -157,15 +187,17 @@ const schema = reactive<FormSchema[]>([
         formData.thumbnail = _response.data
       },
       beforeUpload: (rawFile) => {
-        console.log('kokokoko', rawFile)
-        if (
-          rawFile.type !== 'image/jpeg' &&
-          rawFile.type !== 'image/png' &&
-          rawFile.type !== 'image/jpg'
-        ) {
-          ElMessage.error('只能上传png、jpg格式')
+        console.log('sadghasgdaj', rawFile.name.includes('jpeg'))
+        console.log('kankangeshi', rawFile)
+        if (rawFile.name.includes('jpeg')) {
+          ElMessage.error('上传格式：png、jpg!')
           return false
         }
+        if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
+          ElMessage.error('上传格式：png、jpg!')
+          return false
+        }
+
         return true
       },
       slots: {
@@ -216,18 +248,15 @@ const schema = reactive<FormSchema[]>([
       },
       beforeUpload: (rawFile) => {
         console.log('kokokoko', rawFile)
-        if (rawFile.type !== 'application/x-zip-compressed' || rawFile.type !== 'application/zip') {
+        if (rawFile.type !== 'application/x-zip-compressed' && rawFile.type !== 'application/zip') {
           ElMessage.error('只能上传ZIP文件')
           return false
-        } else if (rawFile.size / 1024 / 1024 > 2048) {
-          ElMessage.error('文件不超过2G!')
-          return false
         }
         return true
       },
       slots: {
         default: () => <BaseButton type="primary">点击上传</BaseButton>,
-        tip: () => <div class="el-upload__tip">只能上传ZIP文件，且不超过2G</div>
+        tip: () => <div class="el-upload__tip">只能上传ZIP文件</div>
       }
     }
   }
@@ -246,7 +275,8 @@ const edittab = async (data: TableSlotDefault) => {
   formData.thumbnail = data.row.thumbnail
   imageUrl.value = PATH_URL + data.row.thumbnail
   formData.zoneId = data.row.zoneId
-  schema[2].componentProps.fileList = [
+  formData.typeNumber = data.row.typeNumber
+  schema[3].componentProps.fileList = [
     {
       name: data.row.templateFileName,
       url: data.row.templateFilePath
@@ -350,7 +380,7 @@ const tianjia = async () => {
     />
   </ContentWrap>
 
-  <Dialog v-model="dialogVisible" maxHeight="380px" width="35rem" :title="isedit">
+  <Dialog v-model="dialogVisible" maxHeight="430px" width="35rem" :title="isedit">
     <Form :schema="schema" @register="formRegister" />
 
     <template #footer>