From 814c7198c7d79fcb325bea7db64a3bb930035817 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Wed, 26 Mar 2025 09:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vite-config/src/config/application.ts | 70 +++++++++++++++++-- internal/vite-config/src/config/common.ts | 1 - internal/vite-config/src/config/package.ts | 2 +- package.json | 18 +++-- postcss.config.js | 13 ++++ src/views/system/tenant/tenant.data.ts | 12 ++-- src/views/system/tenant/tenant.drawer.data.ts | 12 ++-- .../DocumentTasksPermissions.data.ts | 4 +- .../DocumentTasksPermissionsDetail.data.ts | 2 +- vite.config.ts | 1 - ....timestamp-1742898703663-a69823ac05aa8.mjs | 37 ++++++++++ 11 files changed, 145 insertions(+), 27 deletions(-) create mode 100644 postcss.config.js create mode 100644 vite.config.ts.timestamp-1742898703663-a69823ac05aa8.mjs diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 9aca8f5..27057e8 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -7,7 +7,13 @@ import { defineConfig, loadEnv, mergeConfig, type UserConfig } from 'vite'; import { createPlugins } from '../plugins'; import { generateModifyVars } from '../utils/modifyVars'; import { commonConfig } from './common'; - +import { babel } from '@rollup/plugin-babel'; +import "@babel/plugin-transform-runtime" +// import PostCssPresetEnv from 'postcss-preset-env'; +import PostCssPresetEnv from 'postcss-preset-env'; +import postcssNested from 'postcss-nested'; +import postcssCustomProperties from 'postcss-custom-properties'; +import postcssImport from 'postcss-import'; interface DefineOptions { overrides?: UserConfig; options?: { @@ -55,8 +61,9 @@ function defineApplicationConfig(defineOptions: DefineOptions = {}) { }, define: defineData, build: { - target: 'es2022', - cssTarget: 'chrome80', + target: 'es2015', + cssTarget: 'chrome70', + minify: 'terser', rollupOptions: { output: { // 入口文件名 @@ -74,15 +81,70 @@ function defineApplicationConfig(defineOptions: DefineOptions = {}) { // ], }, }, + // css: { + // preprocessorOptions: { + // less: { + // modifyVars: generateModifyVars(), + // javascriptEnabled: true, + // }, + // }, + // }, css: { preprocessorOptions: { less: { modifyVars: generateModifyVars(), javascriptEnabled: true, }, + css: { charset: false } }, + postcss: { + plugins: [ + postcssImport(), + postcssCustomProperties({ + preserve: true + }), + postcssNested(), + PostCssPresetEnv({ + autoprefixer: { + overrideBrowserslist: [ + 'Chrome >= 49', + 'Firefox >= 52', + 'Safari >= 10', + 'Edge >= 13' + ], + grid: true + }, + stage: 3, + features: { + 'nesting-rules': true, + 'custom-properties': { + preserve: true + }, + 'custom-media-queries': true, + 'media-query-ranges': true, + // 添加对 Grid 布局的支持 + 'grid-template-columns': true, + 'grid-template-rows': true, + 'grid-auto-columns': true, + 'grid-auto-rows': true, + 'grid-auto-flow': true, + 'grid-area': true, + 'grid-template-areas': true + }, + preserve: true, + enableClientSidePolyfills: true + }) + ] + } }, - plugins, + plugins: [ + babel({ + presets: [ + ['@babel/preset-env', { targets: "defaults" }] + ] + }), + ...plugins, + ], }; const mergedConfig = mergeConfig(commonConfig(mode), applicationConfig); diff --git a/internal/vite-config/src/config/common.ts b/internal/vite-config/src/config/common.ts index f07736d..66470ba 100644 --- a/internal/vite-config/src/config/common.ts +++ b/internal/vite-config/src/config/common.ts @@ -1,6 +1,5 @@ import UnoCSS from 'unocss/vite'; import { loadEnv, type UserConfig } from 'vite'; - const commonConfig: (mode: string) => UserConfig = (mode) => { const { VITE_DROP_CONSOLE } = loadEnv(mode, process.cwd()); const dropConsole = VITE_DROP_CONSOLE === 'true'; diff --git a/internal/vite-config/src/config/package.ts b/internal/vite-config/src/config/package.ts index ab83852..adc0f09 100644 --- a/internal/vite-config/src/config/package.ts +++ b/internal/vite-config/src/config/package.ts @@ -30,7 +30,7 @@ function definePackageConfig(defineOptions: DefineOptions = {}) { plugins: [ dts({ logLevel: 'error', - }), + }) ], }; const mergedConfig = mergeConfig(commonConfig(mode), packageConfig); diff --git a/package.json b/package.json index e464e54..f369930 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,17 @@ "@vueuse/core": "^10.11.1", "@zxcvbn-ts/core": "3.0.4", "ant-design-vue": "4.2.6", + "@rollup/plugin-babel": "6.0.4", + "@babel/preset-env":"7.26.9", + "@babel/plugin-transform-runtime":"7.26.10", + "@babel/runtime-corejs3":"7.27.0", + "postcss-preset-env":"10.1.5", + "postcss":"8.5.3", + "postcss-loader":"8.1.1", + "postcss-nested":"7.0.2", + "postcss-custom-properties":"14.0.4", + "postcss-import":"16.1.0", + "autoprefixer":"10.4.21", "axios": "1.7.4", "bpmn-js": "17.5.0", "bpmn-js-token-simulation": "0.34.1", @@ -183,11 +194,8 @@ "vue-tsc": "2.1.10", "layer-vue":"2.0.0-alpha.0", "vite-plugin-top-level-await":"1.4.4", - "md-editor-v3": "^4.9.0", - "markdown-it": "^13.0.2", - "markdown-it-anchor": "^8.6.7", - "markdown-it-toc-done-right": "^4.2.0", - "@vue-office/pdf": "^2.0.10" + "@vue-office/pdf": "^2.0.10", + "md-editor-v3": "^4.9.0" }, "engines": { "node": ">=18.12.0", diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000..e4c0d0d --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,13 @@ +module.exports = { + + plugins: { + + + autoprefixer: {} + + + } + + +}; + diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts index d20b7d6..cd59134 100644 --- a/src/views/system/tenant/tenant.data.ts +++ b/src/views/system/tenant/tenant.data.ts @@ -1,6 +1,6 @@ import { BasicColumn } from '@/components/Table'; import { FormSchema, commonRules } from '@/components/Form'; -import dayjs from 'dayjs'; +// import dayjs from 'dayjs'; export const columns: BasicColumn[] = [ { @@ -58,10 +58,10 @@ export const formSchemas: FormSchema[] = [ }, ]; -const defaultExpireTime = dayjs(new Date()) - .add(365, 'days') - .startOf('day') - .format('YYYY-MM-DD HH:mm:ss'); +// const defaultExpireTime = dayjs(new Date()) +// .add(365, 'days') +// .startOf('day') +// .format('YYYY-MM-DD HH:mm:ss'); export const modalSchemas: FormSchema[] = [ { field: 'id', @@ -120,7 +120,7 @@ export const modalSchemas: FormSchema[] = [ '即在开通时未设置无期限 以后都不允许设置', ], component: 'DatePicker', - defaultValue: defaultExpireTime, + defaultValue: "defaultExpireTime", componentProps: { showTime: true, format: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/system/tenant/tenant.drawer.data.ts b/src/views/system/tenant/tenant.drawer.data.ts index ebb101b..c97dea5 100644 --- a/src/views/system/tenant/tenant.drawer.data.ts +++ b/src/views/system/tenant/tenant.drawer.data.ts @@ -1,11 +1,11 @@ import { FormSchema, commonRules } from '@/components/Form'; -import dayjs from 'dayjs'; +// import dayjs from 'dayjs'; -const defaultExpireTime = dayjs(new Date()) - .add(365, 'days') - .startOf('day') - .format('YYYY-MM-DD HH:mm:ss'); +// const defaultExpireTime = dayjs(new Date()) +// .add(365, 'days') +// .startOf('day') +// .format('YYYY-MM-DD HH:mm:ss'); /** 抽屉使用 */ export const drawerSchemas: FormSchema[] = [ { @@ -94,7 +94,7 @@ export const drawerSchemas: FormSchema[] = [ '即在开通时未设置无期限 以后都不允许设置', ], component: 'DatePicker', - defaultValue: defaultExpireTime, + defaultValue: "defaultExpireTime", componentProps: { showTime: true, format: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/taskPermissions/DocumentTasksPermissions/DocumentTasksPermissions.data.ts b/src/views/taskPermissions/DocumentTasksPermissions/DocumentTasksPermissions.data.ts index d108f0d..b2d8e52 100644 --- a/src/views/taskPermissions/DocumentTasksPermissions/DocumentTasksPermissions.data.ts +++ b/src/views/taskPermissions/DocumentTasksPermissions/DocumentTasksPermissions.data.ts @@ -5,8 +5,8 @@ import { getDictOptions, getDict } from '@/utils/dict'; import { getUsersAll } from '@/api/taskPermissions/DocumentTasksPermissions'; import { useRender } from '@/hooks/component/useRender'; const { renderDict, renderDictTags } = useRender(); -const roleOption = await roleOptionSelect(); -const userOption = await getUsersAll(); +const roleOption = roleOptionSelect(); +const userOption = getUsersAll(); export const formSchemas: FormSchema[] = [ { diff --git a/src/views/taskPermissions/DocumentTasksPermissionsDetail/DocumentTasksPermissionsDetail.data.ts b/src/views/taskPermissions/DocumentTasksPermissionsDetail/DocumentTasksPermissionsDetail.data.ts index 9cb5c2b..3e55e6c 100644 --- a/src/views/taskPermissions/DocumentTasksPermissionsDetail/DocumentTasksPermissionsDetail.data.ts +++ b/src/views/taskPermissions/DocumentTasksPermissionsDetail/DocumentTasksPermissionsDetail.data.ts @@ -3,7 +3,7 @@ import { FormSchema } from '@/components/Form'; import { getDictOptions } from '@/utils/dict'; import { useRender } from '@/hooks/component/useRender'; import { getUsersAll } from '@/api/taskPermissions/DocumentTasksPermissions'; -const userOption = await getUsersAll(); +const userOption = getUsersAll(); export const formSchemas: FormSchema[] = [ { diff --git a/vite.config.ts b/vite.config.ts index 272c777..91d5664 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,5 +1,4 @@ import { defineApplicationConfig } from '@vben/vite-config'; - export default defineApplicationConfig({ overrides: { optimizeDeps: { diff --git a/vite.config.ts.timestamp-1742898703663-a69823ac05aa8.mjs b/vite.config.ts.timestamp-1742898703663-a69823ac05aa8.mjs new file mode 100644 index 0000000..3476c57 --- /dev/null +++ b/vite.config.ts.timestamp-1742898703663-a69823ac05aa8.mjs @@ -0,0 +1,37 @@ +// vite.config.ts +import { defineApplicationConfig } from "file:///D:/project/zaojia/ruoyi-plus-vben-main/ruoyi-plus-vben-main/internal/vite-config/dist/index.mjs"; +var vite_config_default = defineApplicationConfig({ + overrides: { + optimizeDeps: { + include: [ + "echarts/core", + "echarts/charts", + "echarts/components", + "echarts/renderers", + "qrcode", + "@iconify/iconify", + "ant-design-vue/es/locale/zh_CN", + "ant-design-vue/es/locale/en_US" + ] + }, + server: { + proxy: { + "/basic-api": { + target: "http://localhost:8080", + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "") + } + }, + open: true, + // 项目启动后，自动打开 + warmup: { + clientFiles: ["./index.html", "./src/{views,components}/*"] + } + } + } +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJEOlxcXFxwcm9qZWN0XFxcXHphb2ppYVxcXFxydW95aS1wbHVzLXZiZW4tbWFpblxcXFxydW95aS1wbHVzLXZiZW4tbWFpblwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiRDpcXFxccHJvamVjdFxcXFx6YW9qaWFcXFxccnVveWktcGx1cy12YmVuLW1haW5cXFxccnVveWktcGx1cy12YmVuLW1haW5cXFxcdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL0Q6L3Byb2plY3QvemFvamlhL3J1b3lpLXBsdXMtdmJlbi1tYWluL3J1b3lpLXBsdXMtdmJlbi1tYWluL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5leHBvcnQgZGVmYXVsdCBkZWZpbmVBcHBsaWNhdGlvbkNvbmZpZyh7XG4gIG92ZXJyaWRlczoge1xuICAgIG9wdGltaXplRGVwczoge1xuICAgICAgaW5jbHVkZTogW1xuICAgICAgICAnZWNoYXJ0cy9jb3JlJyxcbiAgICAgICAgJ2VjaGFydHMvY2hhcnRzJyxcbiAgICAgICAgJ2VjaGFydHMvY29tcG9uZW50cycsXG4gICAgICAgICdlY2hhcnRzL3JlbmRlcmVycycsXG4gICAgICAgICdxcmNvZGUnLFxuICAgICAgICAnQGljb25pZnkvaWNvbmlmeScsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvemhfQ04nLFxuICAgICAgICAnYW50LWRlc2lnbi12dWUvZXMvbG9jYWxlL2VuX1VTJyxcbiAgICAgIF0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA4MCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICB9LFxuICAgICAgfSxcbiAgICAgIG9wZW46IHRydWUsIC8vIFx1OTg3OVx1NzZFRVx1NTQyRlx1NTJBOFx1NTQwRVx1RkYwQ1x1ODFFQVx1NTJBOFx1NjI1M1x1NUYwMFxuICAgICAgd2FybXVwOiB7XG4gICAgICAgIGNsaWVudEZpbGVzOiBbJy4vaW5kZXguaHRtbCcsICcuL3NyYy97dmlld3MsY29tcG9uZW50c30vKiddLFxuICAgICAgfSxcbiAgICB9LFxuICB9LFxufSk7XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQTZXLFNBQVMsK0JBQStCO0FBQ3JaLElBQU8sc0JBQVEsd0JBQXdCO0FBQUEsRUFDckMsV0FBVztBQUFBLElBQ1QsY0FBYztBQUFBLE1BQ1osU0FBUztBQUFBLFFBQ1A7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsTUFDRjtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLE9BQU87QUFBQSxRQUNMLGNBQWM7QUFBQSxVQUNaLFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sYUFBYSxHQUFHLEVBQUU7QUFBQSxRQUMvRDtBQUFBLE1BQ0Y7QUFBQSxNQUNBLE1BQU07QUFBQTtBQUFBLE1BQ04sUUFBUTtBQUFBLFFBQ04sYUFBYSxDQUFDLGdCQUFnQiw0QkFBNEI7QUFBQSxNQUM1RDtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K