diff --git a/yudao-ui-admin-vue3/.env.base b/yudao-ui-admin-vue3/.env.base index 7a2f2a0ff..fdb26d850 100644 --- a/yudao-ui-admin-vue3/.env.base +++ b/yudao-ui-admin-vue3/.env.base @@ -1,6 +1,8 @@ # 本地开发环境 NODE_ENV=development +VITE_DEV=true + # 请求路径 VITE_BASE_URL='http://localhost:48080' diff --git a/yudao-ui-admin-vue3/.env.dev b/yudao-ui-admin-vue3/.env.dev index a67cdc686..3b85e4819 100644 --- a/yudao-ui-admin-vue3/.env.dev +++ b/yudao-ui-admin-vue3/.env.dev @@ -1,6 +1,8 @@ # 开发环境 NODE_ENV=production +VITE_DEV=false + # 请求路径 VITE_BASE_URL='http://localhost:48080' diff --git a/yudao-ui-admin-vue3/.env.pro b/yudao-ui-admin-vue3/.env.pro index 4b47737e1..8348e02e3 100644 --- a/yudao-ui-admin-vue3/.env.pro +++ b/yudao-ui-admin-vue3/.env.pro @@ -1,6 +1,8 @@ # 生产环境 NODE_ENV=production +VITE_DEV=false + # 请求路径 VITE_BASE_URL='http://localhost:48080' diff --git a/yudao-ui-admin-vue3/.env.test b/yudao-ui-admin-vue3/.env.test index 6166840fa..85e2cf545 100644 --- a/yudao-ui-admin-vue3/.env.test +++ b/yudao-ui-admin-vue3/.env.test @@ -1,6 +1,8 @@ # 测试环境 NODE_ENV=production +VITE_DEV=false + # 请求路径 VITE_BASE_URL='http://localhost:48080' diff --git a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue index d093489db..340497512 100644 --- a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue +++ b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue @@ -255,16 +255,17 @@ const getToolBarConfig = (options: XTableProps) => { if (toolbarConfig) return if (toolBar) { if (!isBoolean(toolBar)) { + console.info(2) options.toolbarConfig = toolBar return } - } else if (!topActionSlots) { + } else if (topActionSlots != false) { options.toolbarConfig = { - enabled: true + slots: { buttons: 'toolbar_buttons' } } } else { options.toolbarConfig = { - slots: { buttons: 'toolbar_buttons' } + enabled: true } } } diff --git a/yudao-ui-admin-vue3/src/main.ts b/yudao-ui-admin-vue3/src/main.ts index e4511d9b1..f5e3c024e 100644 --- a/yudao-ui-admin-vue3/src/main.ts +++ b/yudao-ui-admin-vue3/src/main.ts @@ -37,6 +37,13 @@ import App from './App.vue' import './permission' +import { isDevMode } from '@/utils/env' + +if (isDevMode()) { + console.info(isDevMode()) + import('element-plus/dist/index.css') +} + // 创建实例 const setupAll = async () => { const app = createApp(App) diff --git a/yudao-ui-admin-vue3/src/types/auto-components.d.ts b/yudao-ui-admin-vue3/src/types/auto-components.d.ts index 0a56908aa..46a1ae56c 100644 --- a/yudao-ui-admin-vue3/src/types/auto-components.d.ts +++ b/yudao-ui-admin-vue3/src/types/auto-components.d.ts @@ -21,6 +21,7 @@ declare module '@vue/runtime-core' { DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] + ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] @@ -30,6 +31,7 @@ declare module '@vue/runtime-core' { ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] + ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] @@ -38,6 +40,7 @@ declare module '@vue/runtime-core' { ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] + ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] @@ -48,10 +51,14 @@ declare module '@vue/runtime-core' { ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] + ElScroll: typeof import('element-plus/es')['ElScroll'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSkeleton: typeof import('element-plus/es')['ElSkeleton'] + ElSpace: typeof import('element-plus/es')['ElSpace'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/yudao-ui-admin-vue3/src/utils/env.ts b/yudao-ui-admin-vue3/src/utils/env.ts new file mode 100644 index 000000000..4a45f6223 --- /dev/null +++ b/yudao-ui-admin-vue3/src/utils/env.ts @@ -0,0 +1,8 @@ +export const isDevMode = () => { + const dev = import.meta.env.VITE_DEV + if (dev && dev === true) { + return true + } else { + return false + } +} diff --git a/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue b/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue index 72a826e61..dce8122ee 100644 --- a/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue @@ -5,5 +5,6 @@ diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue index 971db66dc..d125112de 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue @@ -8,17 +8,19 @@ - + + +