Home Verkennen Help
Registreren Inloggen
peter
/
crm_extend
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

build: 项目依赖更新. tailwindcss升级至版本4.

peter 2 dagen geleden
bovenliggende
981992b70c
commit
d6f6fb7dc7
14 gewijzigde bestanden met toevoegingen van 21 en 88 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 0
      index.html
  2. 7 7
      package.json
  3. 0 9
      postcss.config.cjs
  4. 0 1
      src/App.vue
  5. 0 35
      src/assets/css/flex-custom.scss
  6. 0 3
      src/assets/css/tailwind.scss
  7. 4 0
      src/assets/tailwind.css
  8. 1 1
      src/pages/indent-manage/indent/list.vue
  9. 1 1
      src/pages/indent-manage/login.vue
  10. 1 1
      src/pages/indent-manage/product/list.vue
  11. 1 1
      src/pages/indent-manage/supplier/list.vue
  12. 2 2
      src/pages/so-search/index.vue
  13. 1 27
      tailwind.config.cjs
  14. 2 0
      vite.config.ts

+ 1 - 0
index.html
Bestand weergeven 

@@ -7,6 +7,7 @@
 
     <meta name="keywords" content="zoho crm extend">
 
     <script src="/crm.sdk.js"></script>
 
    <title>crm_extend</title>
 
+   <link href="/src/assets/tailwind.css" rel="stylesheet">
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 7 - 7
package.json
Bestand weergeven 

@@ -11,12 +11,13 @@
 
   },
 
   "dependencies": {
 
     "@element-plus/icons-vue": "^2.1.0",
 
+    "@tailwindcss/vite": "^4.0.17",
 
     "axios": "~0.27.2",
 
     "dayjs": "^1.11.13",
 
-    "element-plus": "2.9.6",
 
+    "element-plus": "2.9.7",
 
     "html2canvas": "^1.4.1",
 
     "js-cookie": "^3.0.5",
 
-    "jspdf": "3.0.0",
 
+    "jspdf": "3.0.1",
 
     "lodash": "^4.17.21",
 
     "lodash.clonedeep": "^4.5.0",
 
     "lodash.debounce": "^4.0.8",
 
@@ -29,24 +30,23 @@
 
   },
 
   "devDependencies": {
 
     "@nabla/vite-plugin-eslint": "^2.0.5",
 
-    "@tailwindcss/vite": "^4.0.11",
 
+    "@tailwindcss/vite": "^4.1.0",
 
     "@types/js-cookie": "^3.0.6",
 
     "@types/lodash.clonedeep": "^4.5.9",
 
     "@types/lodash.debounce": "^4.0.9",
 
     "@types/qrcode": "^1.5.5",
 
     "@typescript-eslint/eslint-plugin": "^7.18.0",
 
     "@typescript-eslint/parser": "^7.18.0",
 
-    "@vitejs/plugin-vue": "^5.2.1",
 
+    "@vitejs/plugin-vue": "^5.2.3",
 
     "@vue/eslint-config-prettier": "^9.0.0",
 
-    "autoprefixer": "^10.4.20",
 
     "eslint": "^8.57.1",
 
     "eslint-config-prettier": "^9.1.0",
 
     "eslint-plugin-vue": "^9.32.0",
 
     "prettier": "^3.5.3",
 
     "sass": "^1.85.1",
 
-    "tailwindcss": "^3.4.17",
 
+    "tailwindcss": "^4.1.0",
 
     "typescript": "^5.8.2",
 
-    "vite": "^6.2.0",
 
+    "vite": "^6.2.4",
 
     "vue-tsc": "^2.2.8"
 
   }
 
 }

+ 0 - 9
postcss.config.cjs
Bestand weergeven 

@@ -1,9 +0,0 @@
 
-// https://github.com/michael-ciniawsky/postcss-load-config
 
-
 
-module.exports = {
 
-  'plugins': {
 
-    tailwindcss: {},
 
-    // to edit target browsers: use "browserslist" field in package.json
 
-    'autoprefixer': {}
 
-  }
 
-}

+ 0 - 1
src/App.vue
Bestand weergeven 

@@ -19,7 +19,6 @@ const locale = ref(zhCn)
 
 </script>
 
 
 <style lang="scss">
 
-@use '@/assets/css/tailwind.scss';
 
 body {
 
   position: relative;
 
   margin: 0;

+ 0 - 35
src/assets/css/flex-custom.scss
Bestand weergeven 

@@ -1,35 +0,0 @@
 
-// 自定义flex布局class。vant-ui的布局默认带有flex-wrap，且有其他干扰，干脆自己定义
 
-.flex {
 
-  display: flex;
 
-  align-content: flex-start; // 侧轴方向 行与行的对齐
 
-  align-items: center; // 侧轴方向 行内item的对齐
 
-  &.column {
 
-    flex-direction: column; // 定义主轴方向
 
-  }
 
-  &.wrap {
 
-    flex-wrap: wrap;
 
-  }
 
-  /* 主轴方向 item的对齐 */
 
-  &.around {
 
-    justify-content: space-around;
 
-  }
 
-  &.between {
 
-    justify-content: space-between;
 
-  }
 
-  &.center {
 
-    justify-content: center;
 
-  }
 
-  &.end {
 
-    justify-content: flex-end;
 
-  }
 
-  &.baseline {
 
-    align-items: baseline;
 
-  }
 
-  &.start {
 
-    align-items: flex-start;
 
-  }
 
-  &.stretch {
 
-    align-items: stretch;
 
-  }
 
-}
 
-.flex-auto { flex: auto; }

+ 0 - 3
src/assets/css/tailwind.scss
Bestand weergeven 

@@ -1,3 +0,0 @@
 
-@tailwind base;
 
-@tailwind components;
 
-@tailwind utilities;

+ 4 - 0
src/assets/tailwind.css
Bestand weergeven 

@@ -0,0 +1,4 @@
 
+/* @import "tailwindcss"; */
 
+@layer theme, base, components, utilities;
 
+@import 'tailwindcss/theme.css' layer(theme);
 
+@import 'tailwindcss/utilities.css' layer(utilities);

+ 1 - 1
src/pages/indent-manage/indent/list.vue
Bestand weergeven 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
 
+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
 
     <el-form
 
       ref="searchForm"
 
       v-loading="loading"

+ 1 - 1
src/pages/indent-manage/login.vue
Bestand weergeven 

@@ -4,7 +4,7 @@
 
     class="flex items-center justify-center"
 
   >
 
     <div
 
-      class="w-[400px] px-4 py-6 border border-solid border-gray-100 rounded shadow"
 
+      class="w-[400px] px-4 py-6 border border-solid border-gray-200 rounded-sm shadow-sm"
 
     >
 
       <div class="text-center text-gray-800 text-xl font-bold mt-2 mb-8">
 
         Indent APP Login

+ 1 - 1
src/pages/indent-manage/product/list.vue
Bestand weergeven 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
 
+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
 
     <el-form
 
       ref="searchForm"
 
       :inline="true"

+ 1 - 1
src/pages/indent-manage/supplier/list.vue
Bestand weergeven 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="page-indent-list py-4 px-2 shadow max-w-[1800px] mx-auto">
 
+  <div class="page-indent-list py-4 px-2 shadow-sm max-w-[1800px] mx-auto">
 
     <el-form
 
       ref="searchForm"
 
       :inline="true"

+ 2 - 2
src/pages/so-search/index.vue
Bestand weergeven 

@@ -199,7 +199,7 @@
 
               width: `${pageWidth}cm`,
 
               height: `${pageHeight}cm`,
 
             }"
 
-            class="pdf-wrap relative border border-solid border-gray-e mb-2 mr-2"
 
+            class="pdf-wrap relative border border-solid border-gray-100 mb-2 mr-2"
 
           >
 
             <div
 
               :id="`pdfItem-${i}`"
 
@@ -238,7 +238,7 @@
 
               </div>
 
               <div
 
                 v-show="qrcodeVisible"
 
-                class="qrcode absolute bottom-4 right-4 w-[110px] h-[110px] border border-solid border-gray-7"
 
+                class="qrcode absolute bottom-4 right-4 w-[110px] h-[110px] border border-solid border-gray-500"
 
               >
 
                 <img
 
                   v-show="qrcodeURL.length"

+ 1 - 27
tailwind.config.cjs
Bestand weergeven 

@@ -1,32 +1,6 @@
 
 /** @type {import('tailwindcss').Config} */
 
 module.exports = {
 
   content: ['./index.html', './src/**/*.{vue,js}'],
 
-  theme: {
 
-    extend: {
 
-      colors: {
 
-        gray: {
 
-          0: '#000',
 
-          1: '#111',
 
-          2: '#222',
 
-          3: '#333',
 
-          4: '#444',
 
-          5: '#555',
 
-          6: '#666',
 
-          7: '#777',
 
-          8: '#888',
 
-          9: '#999',
 
-          a: '#aaa',
 
-          b: '#bbb',
 
-          c: '#ccc',
 
-          d: '#ddd',
 
-          e: '#eee',
 
-          f: '#fff',
 
-        },
 
-      },
 
-    },
 
-  },
 
+  theme: {},
 
   plugins: [],
 
-  corePlugins: {
 
-    preflight: false,
 
-  },
 
 }

+ 2 - 0
vite.config.ts
Bestand weergeven 

@@ -1,6 +1,7 @@
 
 import { defineConfig } from 'vite'
 
 import vue from '@vitejs/plugin-vue'
 
 import eslintPlugin from '@nabla/vite-plugin-eslint'
 
+import tailwindcss from '@tailwindcss/vite'
 
 
 // https://vitejs.dev/config/
 
 export default defineConfig(({ mode }) => {
 
@@ -39,6 +40,7 @@ export default defineConfig(({ mode }) => {
 
     },
 
     plugins: [
 
       vue({ template: { compilerOptions: { hoistStatic: false } } }),
 
+      tailwindcss(),
 
       eslintPlugin(),
 
     ],
 
     build: {