diff --git a/openhis-ui-vue3/.prettierrc.json b/openhis-ui-vue3/.prettierrc.json new file mode 100644 index 0000000000000000000000000000000000000000..f37f034e8d75a10bd86d8a2020be3d4456b927ef --- /dev/null +++ b/openhis-ui-vue3/.prettierrc.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/prettierrc", + "semi": false, + "singleQuote": true, + "printWidth": 120, + "trailingComma": "all", + "bracketSameLine": true, + "bracketSpacing": true, + "htmlWhitespaceSensitivity": "ignore" +} diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json index 5824a057caf1568c9a03f8f4414c2cb2dd54d5fa..076b54a10b24370b11de1774d70000ba0e71a991 100644 --- a/openhis-ui-vue3/package.json +++ b/openhis-ui-vue3/package.json @@ -9,7 +9,8 @@ "dev": "vite", "build:prod": "vite build", "build:stage": "vite build --mode staging", - "preview": "vite preview" + "preview": "vite preview", + "format": "prettier --write src/" }, "repository": { "type": "git", @@ -18,8 +19,9 @@ "dependencies": { "@element-plus/icons-vue": "2.3.1", "@vueup/vue-quill": "1.2.0", - "@vueuse/core": "10.6.1", - "axios": "0.27.2", + "@vueuse/components": "^13.9.0", + "@vueuse/core": "^13.9.0", + "axios": "^1.12.0", "d3": "^7.9.0", "decimal.js": "^10.5.0", "echarts": "5.4.3", @@ -37,6 +39,7 @@ "pinyin": "^4.0.0-alpha.2", "province-city-china": "^8.5.8", "segmentit": "^2.0.3", + "tailwindcss": "^4.1.14", "v-region": "^3.3.0", "vue": "^3.5.13", "vue-area-linkage": "^5.1.0", @@ -45,12 +48,14 @@ "vue-router": "4.2.5" }, "devDependencies": { + "@tailwindcss/vite": "^4.1.14", "@vitejs/plugin-vue": "4.5.0", "@vue/compiler-sfc": "3.3.9", - "sass": "1.69.5", + "prettier": "^3.6.2", + "sass": "^1.93.2", "unplugin-auto-import": "0.17.1", "unplugin-vue-setup-extend-plus": "1.0.0", - "vite": "5.0.4", + "vite": "^7.1.5", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1" } diff --git a/openhis-ui-vue3/src/assets/styles/tailwind.css b/openhis-ui-vue3/src/assets/styles/tailwind.css new file mode 100644 index 0000000000000000000000000000000000000000..0989eead5da8c4fd4f2f6a88d6e90e6db4fcfa1b --- /dev/null +++ b/openhis-ui-vue3/src/assets/styles/tailwind.css @@ -0,0 +1,2 @@ +@import 'tailwindcss/theme'; +@import 'tailwindcss/utilities'; diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js index de28c8acf90bed70f3446d0437310473a95f3db1..77fb4e0c0b218d1cef348323ad722b6c39820789 100644 --- a/openhis-ui-vue3/src/main.js +++ b/openhis-ui-vue3/src/main.js @@ -1,3 +1,5 @@ +import '@/assets/styles/tailwind.css' // tailwindcss + import { createApp } from 'vue' import Cookies from 'js-cookie' diff --git a/openhis-ui-vue3/vite/plugins/index.js b/openhis-ui-vue3/vite/plugins/index.js index a082e34770de6ebc22ded3d6a54f252a24d1b3f5..078d776a039d1275735b3386053d1834e1837445 100644 --- a/openhis-ui-vue3/vite/plugins/index.js +++ b/openhis-ui-vue3/vite/plugins/index.js @@ -4,13 +4,14 @@ import createAutoImport from './auto-import' import createSvgIcon from './svg-icon' import createCompression from './compression' import createSetupExtend from './setup-extend' +import tailwindcss from '@tailwindcss/vite' export default function createVitePlugins(viteEnv, isBuild = false) { - const vitePlugins = [vue()] + const vitePlugins = [vue(),tailwindcss()] vitePlugins.push(createAutoImport()) - vitePlugins.push(createSetupExtend()) - vitePlugins.push(createSvgIcon(isBuild)) - // 住院代码影响打包 打包时暂时替换为空文件 + vitePlugins.push(createSetupExtend()) + vitePlugins.push(createSvgIcon(isBuild)) + // 住院代码影响打包 打包时暂时替换为空文件 // 新增排除住院管理模块的插件 // vitePlugins.push({ // name: 'exclude-in-hospital-management', @@ -33,6 +34,6 @@ export default function createVitePlugins(viteEnv, isBuild = false) { // return null // } // }) - isBuild && vitePlugins.push(...createCompression(viteEnv)) + isBuild && vitePlugins.push(...createCompression(viteEnv)) return vitePlugins }