diff --git a/src/App.vue b/src/App.vue index c244fd5..a885989 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,10 +19,7 @@ const { t } = useI18n(); const store = useGlobalStore(); -const needSettingPages = ['mock', 'assets']; - const isShow = ref(false); -const settingFor = ref('mock'); const lang = Intl.DateTimeFormat().resolvedOptions().locale; const locale = lang.toLocaleLowerCase().includes('zh') ? zhCn : en; @@ -51,84 +48,6 @@ const mockConf = ref({ authValuePartten: 'Bearer ${token}', }); -// 静态资源页面的配置数据 -const assetsConf = ref({ - username: '', - password: '', - token: '', - apiPath: '', - authType: 'header', - method: 'POST', - passwordEncryptType: 'MD5', - salt: '', - conf: `{ - "auth": { - "Authorization": "Bearer \${token}", - }, - "logInfoMap": { - "username": "username", - "password": "password", - }, - "token": "data.token", -}`, - list: { - url: '', - method: 'POST', - conf: `{ - "req": { - "map": { - "current": "current", - "size": "size", - } - }, - "res": { - "map": { - "total": "total", - "list": "data", - }, - "itemMap": { - "url": "imgUrl", - "time": "date", - "name": "name", - "extension": "extension" - } - } -}`, - }, - upload: { - url: '', - method: 'POST', - conf: `{ - "res": { - "map": { - "id": "id", - "url": "data", - "name": "name", - "extension": "extension", - "time": "date", - } - } -}`, - }, - delete: { - url: '', - method: 'GET', - conf: `{ - "res": { - "result": "data" - } -}`, - }, - update: { - url: '', - method: 'POST', - conf: `{ - "res": { - "result": "data" - } -}`, - } -}); const handleMenuItemClick = (menuItem: MenuItem) => { const { path } = menuItem; @@ -136,7 +55,7 @@ const handleMenuItemClick = (menuItem: MenuItem) => { } const handleLogin = async () => { - const info = settingFor.value === 'mock' ? mockConf.value : assetsConf.value; + const info = mockConf.value; await handleSaveSetting(true); const loginFunc = getRequestFormConf({ passwordEncryptType: info.passwordEncryptType, @@ -160,13 +79,7 @@ const handleLogin = async () => { // 保存配置 如果有token的话，保存的效果就等同登录了 const handleSaveSetting = async (isLogin: boolean = false) => { try { - const info = settingFor.value === 'mock' ? mockConf.value : assetsConf.value; - store.setSetting(settingFor.value, info); - - const res = await setPageSetting({ - settingFor: settingFor.value, - ...info, - }); + const res = await setPageSetting(mockConf.value); if(isLogin !== true) { if(res.code === 200) { @@ -187,13 +100,9 @@ const handleGetSetting = async () => { const res = await getPageSetting(); if(res.code === 200) { const { data } = res; - if(Object.keys(data.mock ?? {}).length) { - mockConf.value = data.mock; - store.setSetting('mock', data.mock); - } - if(Object.keys(data.assets ?? {}).length) { - assetsConf.value = data.assets; - store.setSetting('assets', data.assets); + if(Object.keys(data ?? {}).length) { + mockConf.value = data; + store.setSetting(data); } } } catch (error) { @@ -224,7 +133,7 @@ onMounted(handleGetSetting); @click="isShow = true" > - 设置 + {{ t('global.systemSetting') }} @@ -232,17 +141,8 @@ onMounted(handleGetSetting); - -
-
- {{ item }} Setting -
-
- - + + diff --git a/src/assets/pngIcons/doc.png b/src/assets/pngIcons/doc.png deleted file mode 100644 index 9d339be..0000000 Binary files a/src/assets/pngIcons/doc.png and /dev/null differ diff --git a/src/assets/pngIcons/file.png b/src/assets/pngIcons/file.png deleted file mode 100644 index 65b61de..0000000 Binary files a/src/assets/pngIcons/file.png and /dev/null differ diff --git a/src/assets/pngIcons/image.png b/src/assets/pngIcons/image.png deleted file mode 100644 index 9ec28da..0000000 Binary files a/src/assets/pngIcons/image.png and /dev/null differ diff --git a/src/assets/pngIcons/mp3.png b/src/assets/pngIcons/mp3.png deleted file mode 100644 index 4a7867f..0000000 Binary files a/src/assets/pngIcons/mp3.png and /dev/null differ diff --git a/src/assets/pngIcons/pdf.png b/src/assets/pngIcons/pdf.png deleted file mode 100644 index e379846..0000000 Binary files a/src/assets/pngIcons/pdf.png and /dev/null differ diff --git a/src/assets/pngIcons/ppt.png b/src/assets/pngIcons/ppt.png deleted file mode 100644 index 0092c86..0000000 Binary files a/src/assets/pngIcons/ppt.png and /dev/null differ diff --git a/src/assets/pngIcons/txt.png b/src/assets/pngIcons/txt.png deleted file mode 100644 index 1680886..0000000 Binary files a/src/assets/pngIcons/txt.png and /dev/null differ diff --git a/src/assets/pngIcons/video.png b/src/assets/pngIcons/video.png deleted file mode 100644 index 4152a64..0000000 Binary files a/src/assets/pngIcons/video.png and /dev/null differ diff --git a/src/assets/pngIcons/xls.png b/src/assets/pngIcons/xls.png deleted file mode 100644 index 004cebc..0000000 Binary files a/src/assets/pngIcons/xls.png and /dev/null differ diff --git a/src/assets/pngIcons/zip.png b/src/assets/pngIcons/zip.png deleted file mode 100644 index dd5f561..0000000 Binary files a/src/assets/pngIcons/zip.png and /dev/null differ diff --git a/src/components/ImageItem.vue b/src/components/ImageItem.vue deleted file mode 100644 index 77ed8a3..0000000 --- a/src/components/ImageItem.vue +++ /dev/null @@ -1,66 +0,0 @@ - - diff --git a/src/i18n/en.ts b/src/i18n/en.ts index 1f23db1..03a5c07 100644 --- a/src/i18n/en.ts +++ b/src/i18n/en.ts @@ -99,5 +99,6 @@ export default { responseConfig: 'responseConfig', sceneName: 'scene name', iteration: 'Iteration', + systemSetting: 'System Setting', }, } \ No newline at end of file diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts index 6437f89..36ef7ec 100644 --- a/src/i18n/zh.ts +++ b/src/i18n/zh.ts @@ -99,5 +99,6 @@ export default { responseConfig: '返回值配置', sceneName: '场景名', iteration: '迭代期', + systemSetting: '系统设置', }, } \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index 20d0ac2..97120a9 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -4,12 +4,8 @@ import { defineStore } from "pinia"; export const useGlobalStore = defineStore('globalData', () => { const mockSetting = ref({} as any); const assetsSetting = ref({list: {}, upload: {}, delete: {}, update: {}} as any); - const setSetting = (settingFor: string, setting: any) => { - if(settingFor === 'mock') { - mockSetting.value = setting; - } else if(settingFor === 'assets') { - assetsSetting.value = setting; - } + const setSetting = (setting: any) => { + mockSetting.value = setting; }; return { diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 76f4579..c9c3083 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,29 +1,14 @@ import type { MenuItem } from '@/types/common.d.ts' -import docIcon from '@/assets/pngIcons/doc.png'; -import fileIcon from '@/assets/pngIcons/file.png'; -import imageIcon from '@/assets/pngIcons/image.png'; -import mp3Icon from '@/assets/pngIcons/mp3.png'; -import pdfIcon from '@/assets/pngIcons/pdf.png'; -import pptIcon from '@/assets/pngIcons/ppt.png'; -import textIcon from '@/assets/pngIcons/txt.png'; -import videoIcon from '@/assets/pngIcons/video.png'; -import xlsIcon from '@/assets/pngIcons/xls.png'; -import zipIcon from '@/assets/pngIcons/zip.png'; +const envLanguage = Intl.DateTimeFormat().resolvedOptions().locale // 菜单项 export const menuItems: MenuItem[] = [ { path: '/', - name: '数据模拟', + name: envLanguage.includes('zh') ? '数据模拟' : 'Mock', icon: 'mock', component: () => import('@/views/HomeView.vue'), }, - { - path: '/assetsManage', - name: '静态资源', - icon: 'assetsManagement', - component: () => import('@/views/AssetsManage.vue'), - }, ]; // 处理请求的方式 @@ -36,16 +21,3 @@ export const requestMethodList = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'] as co export const apiTypeList = ['HTTP', 'JSON-RPC'] as const; export const wsMessageTypeList = ['param', 'refresh:mockList'] as const; - -export { - docIcon, - fileIcon, - imageIcon, - mp3Icon, - pdfIcon, - pptIcon, - textIcon, - videoIcon, - xlsIcon, - zipIcon, -} \ No newline at end of file diff --git a/src/utils/tools.ts b/src/utils/tools.ts index bfd1699..afd0a20 100644 --- a/src/utils/tools.ts +++ b/src/utils/tools.ts @@ -4,18 +4,6 @@ import get from 'lodash/get'; import set from 'lodash/set'; import crypto from 'crypto-js'; -import { - docIcon, - fileIcon, - mp3Icon, - pdfIcon, - pptIcon, - textIcon, - videoIcon, - xlsIcon, - zipIcon, -} from '@/utils/constants'; - export const getRequestFormConf = (conf: { api: string, @@ -36,7 +24,6 @@ export const getRequestFormConf = (conf: { requestData[logInfoMap.password ?? 'password'] = crypto?.[conf.passwordEncryptType](param.password, conf.salt).toString(); return await defineRequest(conf.api, conf.method)(requestData); } else { - console.log('some11111-----', confObj, conf, formattedApi); const paramMap: Record = confObj?.req?.map ?? {}; const resultMap: Record = confObj?.res?.map ?? {}; const requestData = {} as Record; @@ -74,20 +61,3 @@ export const getRequestFormConf = (conf: { return resultData; } } - - -export const extension2IconMap = { - 'png,jpg,jpeg,gif': 'image', - 'doc,docx': docIcon, - 'xls,xlsx': xlsIcon, - 'ppt,pptx': pptIcon, - 'pdf': pdfIcon, - 'zip,rar': zipIcon, - 'txt,text': textIcon, - 'mp3': mp3Icon, - 'mp4, rmvb, avi, wmv, 3gp, mkv': videoIcon, -}; -export const getAssetsIcon = (extension: string) => { - const entry = Object.entries(extension2IconMap).find(([key]) => key.includes(extension)); - return entry ? entry[1] : fileIcon; -}; \ No newline at end of file diff --git a/src/views/AssetsManage.vue b/src/views/AssetsManage.vue deleted file mode 100644 index cae621f..0000000 --- a/src/views/AssetsManage.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - \ No newline at end of file