Commit 8333e9c3dac52378d603932d23fc9f682fd5bc3b
1 parent
f20aff42
fix: eslint
Showing
12 changed files
with
39 additions
and
59 deletions
yudao-ui-admin-vue3/package.json
| 1 | { | 1 | { |
| 2 | "name": "ruoyi-vue-pro-vue3", | 2 | "name": "ruoyi-vue-pro-vue3", |
| 3 | - "version": "1.6.4.1861", | 3 | + "version": "1.6.4.1862", |
| 4 | "description": "基于vue3、vite3、element-plus、typesScript", | 4 | "description": "基于vue3、vite3、element-plus、typesScript", |
| 5 | "author": "xingyu", | 5 | "author": "xingyu", |
| 6 | "private": false, | 6 | "private": false, |
yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue
| 1 | <script setup lang="ts"> | 1 | <script setup lang="ts"> |
| 2 | import { computed, ref, watch } from 'vue' | 2 | import { computed, ref, watch } from 'vue' |
| 3 | -import { ElSwitch, ElInput, ElMessage } from 'element-plus' | 3 | +import { ElSwitch, ElInput } from 'element-plus' |
| 4 | import { setCssVar } from '@/utils' | 4 | import { setCssVar } from '@/utils' |
| 5 | import { useI18n } from '@/hooks/web/useI18n' | 5 | import { useI18n } from '@/hooks/web/useI18n' |
| 6 | import { useDesign } from '@/hooks/web/useDesign' | 6 | import { useDesign } from '@/hooks/web/useDesign' |
| @@ -108,14 +108,6 @@ const greyModeChange = (show: boolean) => { | @@ -108,14 +108,6 @@ const greyModeChange = (show: boolean) => { | ||
| 108 | appStore.setGreyMode(show) | 108 | appStore.setGreyMode(show) |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | -// 动态路由 | ||
| 112 | -const dynamicRouter = ref(appStore.getDynamicRouter) | ||
| 113 | - | ||
| 114 | -const dynamicRouterChange = (show: boolean) => { | ||
| 115 | - ElMessage.info(t('setting.reExperienced')) | ||
| 116 | - appStore.setDynamicRouter(show) | ||
| 117 | -} | ||
| 118 | - | ||
| 119 | // 固定菜单 | 111 | // 固定菜单 |
| 120 | const fixedMenu = ref(appStore.getFixedMenu) | 112 | const fixedMenu = ref(appStore.getFixedMenu) |
| 121 | 113 | ||
| @@ -208,11 +200,6 @@ watch( | @@ -208,11 +200,6 @@ watch( | ||
| 208 | </div> | 200 | </div> |
| 209 | 201 | ||
| 210 | <div class="flex justify-between items-center"> | 202 | <div class="flex justify-between items-center"> |
| 211 | - <span class="text-14px">{{ t('setting.dynamicRouter') }}</span> | ||
| 212 | - <ElSwitch v-model="dynamicRouter" @change="dynamicRouterChange" /> | ||
| 213 | - </div> | ||
| 214 | - | ||
| 215 | - <div class="flex justify-between items-center"> | ||
| 216 | <span class="text-14px">{{ t('setting.fixedMenu') }}</span> | 203 | <span class="text-14px">{{ t('setting.fixedMenu') }}</span> |
| 217 | <ElSwitch v-model="fixedMenu" @change="fixedMenuChange" /> | 204 | <ElSwitch v-model="fixedMenu" @change="fixedMenuChange" /> |
| 218 | </div> | 205 | </div> |
yudao-ui-admin-vue3/src/locales/en.ts
| @@ -93,7 +93,6 @@ export default { | @@ -93,7 +93,6 @@ export default { | ||
| 93 | footer: 'Footer', | 93 | footer: 'Footer', |
| 94 | uniqueOpened: 'Unique opened', | 94 | uniqueOpened: 'Unique opened', |
| 95 | tagsViewIcon: 'Tags view icon', | 95 | tagsViewIcon: 'Tags view icon', |
| 96 | - dynamicRouter: 'Dynamic router', | ||
| 97 | reExperienced: 'Please exit the login experience again', | 96 | reExperienced: 'Please exit the login experience again', |
| 98 | fixedMenu: 'Fixed menu' | 97 | fixedMenu: 'Fixed menu' |
| 99 | }, | 98 | }, |
yudao-ui-admin-vue3/src/locales/zh-CN.ts
| @@ -93,7 +93,6 @@ export default { | @@ -93,7 +93,6 @@ export default { | ||
| 93 | footer: '页脚', | 93 | footer: '页脚', |
| 94 | uniqueOpened: '菜单手风琴', | 94 | uniqueOpened: '菜单手风琴', |
| 95 | tagsViewIcon: '标签页图标', | 95 | tagsViewIcon: '标签页图标', |
| 96 | - dynamicRouter: '动态路由', | ||
| 97 | reExperienced: '请重新退出登录体验', | 96 | reExperienced: '请重新退出登录体验', |
| 98 | fixedMenu: '固定菜单' | 97 | fixedMenu: '固定菜单' |
| 99 | }, | 98 | }, |
yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | :fixedNumber="options.fixedNumber" | 24 | :fixedNumber="options.fixedNumber" |
| 25 | :fixedBox="options.fixedBox" | 25 | :fixedBox="options.fixedBox" |
| 26 | :centerBox="options.centerBox" | 26 | :centerBox="options.centerBox" |
| 27 | - @realTime="realTime" | 27 | + @real-time="realTime" |
| 28 | /> | 28 | /> |
| 29 | </el-col> | 29 | </el-col> |
| 30 | <el-col :xs="24" :md="12" :style="{ height: '350px' }"> | 30 | <el-col :xs="24" :md="12" :style="{ height: '350px' }"> |
yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
| @@ -55,8 +55,7 @@ import { useI18n } from '@/hooks/web/useI18n' | @@ -55,8 +55,7 @@ import { useI18n } from '@/hooks/web/useI18n' | ||
| 55 | import { useMessage } from '@/hooks/web/useMessage' | 55 | import { useMessage } from '@/hooks/web/useMessage' |
| 56 | import { getSchemaTableListApi, createCodegenListApi } from '@/api/infra/codegen' | 56 | import { getSchemaTableListApi, createCodegenListApi } from '@/api/infra/codegen' |
| 57 | import { ElForm, ElFormItem, ElInput, ElSelect, ElOption } from 'element-plus' | 57 | import { ElForm, ElFormItem, ElInput, ElSelect, ElOption } from 'element-plus' |
| 58 | -import { getDataSourceConfigListApi } from '@/api/infra/dataSourceConfig' | ||
| 59 | -import type { DataSourceConfigVO } from '@/api/infra/dataSourceConfig/types' | 58 | +import { getDataSourceConfigListApi, DataSourceConfigVO } from '@/api/infra/dataSourceConfig' |
| 60 | import type { DatabaseTableVO } from '@/api/infra/codegen/types' | 59 | import type { DatabaseTableVO } from '@/api/infra/codegen/types' |
| 61 | import { VxeTableInstance } from 'vxe-table' | 60 | import { VxeTableInstance } from 'vxe-table' |
| 62 | const { t } = useI18n() // 国际化 | 61 | const { t } = useI18n() // 国际化 |
yudao-ui-admin-vue3/src/views/infra/dbDoc/index.vue
| @@ -2,24 +2,24 @@ | @@ -2,24 +2,24 @@ | ||
| 2 | <ContentWrap title="数据库文档"> | 2 | <ContentWrap title="数据库文档"> |
| 3 | <!-- 操作工具栏 --> | 3 | <!-- 操作工具栏 --> |
| 4 | <div class="mb-10px"> | 4 | <div class="mb-10px"> |
| 5 | - <XButton | ||
| 6 | - type="primary" | ||
| 7 | - preIcon="ep:download" | ||
| 8 | - :title="t('action.export') + ' HTML'" | ||
| 9 | - @click="handleExport('HTML')" | ||
| 10 | - /> | ||
| 11 | - <XButton | ||
| 12 | - type="primary" | ||
| 13 | - preIcon="ep:download" | ||
| 14 | - :title="t('action.export') + ' Word'" | ||
| 15 | - @click="handleExport('Word')" | ||
| 16 | - /> | ||
| 17 | - <XButton | ||
| 18 | - type="primary" | ||
| 19 | - preIcon="ep:download" | ||
| 20 | - :title="t('action.export') + ' Markdown'" | ||
| 21 | - @click="handleExport('Markdown')" | ||
| 22 | - /> | 5 | + <XButton |
| 6 | + type="primary" | ||
| 7 | + preIcon="ep:download" | ||
| 8 | + :title="t('action.export') + ' HTML'" | ||
| 9 | + @click="handleExport('HTML')" | ||
| 10 | + /> | ||
| 11 | + <XButton | ||
| 12 | + type="primary" | ||
| 13 | + preIcon="ep:download" | ||
| 14 | + :title="t('action.export') + ' Word'" | ||
| 15 | + @click="handleExport('Word')" | ||
| 16 | + /> | ||
| 17 | + <XButton | ||
| 18 | + type="primary" | ||
| 19 | + preIcon="ep:download" | ||
| 20 | + :title="t('action.export') + ' Markdown'" | ||
| 21 | + @click="handleExport('Markdown')" | ||
| 22 | + /> | ||
| 23 | </div> | 23 | </div> |
| 24 | <IFrame v-if="!loding" v-loading="loding" :src="src" /> | 24 | <IFrame v-if="!loding" v-loading="loding" :src="src" /> |
| 25 | </ContentWrap> | 25 | </ContentWrap> |
| @@ -45,13 +45,17 @@ const init = async () => { | @@ -45,13 +45,17 @@ const init = async () => { | ||
| 45 | /** 处理导出 */ | 45 | /** 处理导出 */ |
| 46 | const handleExport = async (type: string) => { | 46 | const handleExport = async (type: string) => { |
| 47 | const res = await DbDocApi.exportHtmlApi() | 47 | const res = await DbDocApi.exportHtmlApi() |
| 48 | - if (type === 'HTML') { download.html(res, '数据库文档.html') } | ||
| 49 | - if (type === 'Word') { download.word(res, '数据库文档.doc') } | ||
| 50 | - if(type === 'Markdown') {download.markdown(res, '数据库文档.md')} | ||
| 51 | - | 48 | + if (type === 'HTML') { |
| 49 | + download.html(res, '数据库文档.html') | ||
| 50 | + } | ||
| 51 | + if (type === 'Word') { | ||
| 52 | + download.word(res, '数据库文档.doc') | ||
| 53 | + } | ||
| 54 | + if (type === 'Markdown') { | ||
| 55 | + download.markdown(res, '数据库文档.md') | ||
| 56 | + } | ||
| 52 | } | 57 | } |
| 53 | onMounted(async () => { | 58 | onMounted(async () => { |
| 54 | await init() | 59 | await init() |
| 55 | }) | 60 | }) |
| 56 | </script> | 61 | </script> |
| 57 | - |
yudao-ui-admin-vue3/src/views/infra/druid/index.vue
| @@ -10,4 +10,3 @@ import { IFrame } from '@/components/IFrame' | @@ -10,4 +10,3 @@ import { IFrame } from '@/components/IFrame' | ||
| 10 | const BASE_URL = import.meta.env.VITE_BASE_URL | 10 | const BASE_URL = import.meta.env.VITE_BASE_URL |
| 11 | const src = ref(BASE_URL + '/druid/index.html') | 11 | const src = ref(BASE_URL + '/druid/index.html') |
| 12 | </script> | 12 | </script> |
| 13 | - |
yudao-ui-admin-vue3/src/views/infra/skywalking/index.vue
yudao-ui-admin-vue3/src/views/infra/swagger/index.vue
| @@ -10,4 +10,3 @@ import { IFrame } from '@/components/IFrame' | @@ -10,4 +10,3 @@ import { IFrame } from '@/components/IFrame' | ||
| 10 | const BASE_URL = import.meta.env.VITE_BASE_URL | 10 | const BASE_URL = import.meta.env.VITE_BASE_URL |
| 11 | const src = ref(BASE_URL + '/doc.html') | 11 | const src = ref(BASE_URL + '/doc.html') |
| 12 | </script> | 12 | </script> |
| 13 | - |
yudao-ui-admin-vue3/src/views/system/role/index.vue
| @@ -153,23 +153,20 @@ import { | @@ -153,23 +153,20 @@ import { | ||
| 153 | ElSwitch, | 153 | ElSwitch, |
| 154 | ElTag | 154 | ElTag |
| 155 | } from 'element-plus' | 155 | } from 'element-plus' |
| 156 | -import { DICT_TYPE, getDictOptions } from '@/utils/dict' | 156 | +import { VxeGridInstance } from 'vxe-table' |
| 157 | +import { FormExpose } from '@/components/Form' | ||
| 157 | import { useI18n } from '@/hooks/web/useI18n' | 158 | import { useI18n } from '@/hooks/web/useI18n' |
| 158 | import { useMessage } from '@/hooks/web/useMessage' | 159 | import { useMessage } from '@/hooks/web/useMessage' |
| 159 | -import { FormExpose } from '@/components/Form' | ||
| 160 | -import { rules, allSchemas } from './role.data' | 160 | +import { useVxeGrid } from '@/hooks/web/useVxeGrid' |
| 161 | import { handleTree } from '@/utils/tree' | 161 | import { handleTree } from '@/utils/tree' |
| 162 | import { SystemDataScopeEnum } from '@/utils/constants' | 162 | import { SystemDataScopeEnum } from '@/utils/constants' |
| 163 | -import { useVxeGrid } from '@/hooks/web/useVxeGrid' | ||
| 164 | -import { VxeGridInstance } from 'vxe-table' | 163 | +import { DICT_TYPE, getDictOptions } from '@/utils/dict' |
| 164 | +import { rules, allSchemas } from './role.data' | ||
| 165 | import * as RoleApi from '@/api/system/role' | 165 | import * as RoleApi from '@/api/system/role' |
| 166 | import { listSimpleMenusApi } from '@/api/system/menu' | 166 | import { listSimpleMenusApi } from '@/api/system/menu' |
| 167 | import { listSimpleDeptApi } from '@/api/system/dept' | 167 | import { listSimpleDeptApi } from '@/api/system/dept' |
| 168 | import * as PermissionApi from '@/api/system/permission' | 168 | import * as PermissionApi from '@/api/system/permission' |
| 169 | -import type { | ||
| 170 | - PermissionAssignRoleDataScopeReqVO, | ||
| 171 | - PermissionAssignRoleMenuReqVO | ||
| 172 | -} from '@/api/system/permission/types' | 169 | + |
| 173 | const { t } = useI18n() // 国际化 | 170 | const { t } = useI18n() // 国际化 |
| 174 | const message = useMessage() // 消息弹窗 | 171 | const message = useMessage() // 消息弹窗 |
| 175 | // 列表相关的变量 | 172 | // 列表相关的变量 |
| @@ -305,14 +302,14 @@ const handleScope = async (type: string, row: RoleApi.RoleVO) => { | @@ -305,14 +302,14 @@ const handleScope = async (type: string, row: RoleApi.RoleVO) => { | ||
| 305 | const submitScope = async () => { | 302 | const submitScope = async () => { |
| 306 | const keys = treeRef.value!.getCheckedKeys(false) as unknown as Array<number> | 303 | const keys = treeRef.value!.getCheckedKeys(false) as unknown as Array<number> |
| 307 | if ('data' === actionScopeType.value) { | 304 | if ('data' === actionScopeType.value) { |
| 308 | - const data = ref<PermissionAssignRoleDataScopeReqVO>({ | 305 | + const data = ref<PermissionApi.PermissionAssignRoleDataScopeReqVO>({ |
| 309 | roleId: dataScopeForm.id, | 306 | roleId: dataScopeForm.id, |
| 310 | dataScope: dataScopeForm.dataScope, | 307 | dataScope: dataScopeForm.dataScope, |
| 311 | dataScopeDeptIds: dataScopeForm.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] : keys | 308 | dataScopeDeptIds: dataScopeForm.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] : keys |
| 312 | }) | 309 | }) |
| 313 | await PermissionApi.assignRoleDataScopeApi(data.value) | 310 | await PermissionApi.assignRoleDataScopeApi(data.value) |
| 314 | } else if ('menu' === actionScopeType.value) { | 311 | } else if ('menu' === actionScopeType.value) { |
| 315 | - const data = ref<PermissionAssignRoleMenuReqVO>({ | 312 | + const data = ref<PermissionApi.PermissionAssignRoleMenuReqVO>({ |
| 316 | roleId: dataScopeForm.id, | 313 | roleId: dataScopeForm.id, |
| 317 | menuIds: keys | 314 | menuIds: keys |
| 318 | }) | 315 | }) |
yudao-ui-admin-vue3/src/views/visualization/jmreport/index.vue
| @@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
| 3 | <IFrame :src="src" /> | 3 | <IFrame :src="src" /> |
| 4 | </ContentWrap> | 4 | </ContentWrap> |
| 5 | </template> | 5 | </template> |
| 6 | - | ||
| 7 | <script setup lang="ts"> | 6 | <script setup lang="ts"> |
| 8 | import { ref } from 'vue' | 7 | import { ref } from 'vue' |
| 9 | import { IFrame } from '@/components/IFrame' | 8 | import { IFrame } from '@/components/IFrame' |
| @@ -12,4 +11,3 @@ import { getAccessToken } from '@/utils/auth' | @@ -12,4 +11,3 @@ import { getAccessToken } from '@/utils/auth' | ||
| 12 | const BASE_URL = import.meta.env.VITE_BASE_URL | 11 | const BASE_URL = import.meta.env.VITE_BASE_URL |
| 13 | const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken()) | 12 | const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken()) |
| 14 | </script> | 13 | </script> |
| 15 | - |