canrd-outside / order-erp-front · Commits

Commit 96a49ba1163681465e735efd2273dac0c1bcf6ac

Authored by Vben
1 parent af6d58eb

chore: update deps

Inline Side-by-side
Showing 5 changed files with 41 additions and 40 deletions
build/vite/plugin/theme.ts
  View file @96a49ba
... ... @@ -25,12 +25,7 @@ export function configThemePlugin(isBuild: boolean): Plugin[] {
25 25 colorVariables: [...getThemeColors(), ...colors],
26 26 }),
27 27 antdDarkThemePlugin({
28   - filter: (id) => {
29   - if (isBuild) {
30   - return !id.endsWith('antd.less');
31   - }
32   - return true;
33   - },
  28 + filter: (id) => (isBuild ? !id.endsWith('antd.less') : true),
34 29 // extractCss: false,
35 30 darkModifyVars: {
36 31 ...generateModifyVars(true),
... ...
package.json
  View file @96a49ba
... ... @@ -32,7 +32,7 @@
32 32 },
33 33 "dependencies": {
34 34 "@iconify/iconify": "^2.0.0-rc.6",
35   - "@vueuse/core": "^4.7.0",
  35 + "@vueuse/core": "^4.8.0",
36 36 "@zxcvbn-ts/core": "^0.3.0",
37 37 "ant-design-vue": "^2.1.2",
38 38 "axios": "^0.21.1",
... ... @@ -49,7 +49,7 @@
49 49 "tinymce": "^5.7.1",
50 50 "vditor": "^3.8.4",
51 51 "vue": "3.0.11",
52   - "vue-i18n": "^9.0.0",
  52 + "vue-i18n": "9.0.0",
53 53 "vue-router": "^4.0.6",
54 54 "vue-types": "^3.0.2",
55 55 "vuex": "^4.0.0",
... ... @@ -59,7 +59,7 @@
59 59 "devDependencies": {
60 60 "@commitlint/cli": "^12.1.1",
61 61 "@commitlint/config-conventional": "^12.1.1",
62   - "@iconify/json": "^1.1.325",
  62 + "@iconify/json": "^1.1.327",
63 63 "@purge-icons/generated": "^0.7.0",
64 64 "@types/crypto-js": "^4.0.1",
65 65 "@types/fs-extra": "^9.0.10",
... ... @@ -104,17 +104,17 @@
104 104 "stylelint-config-standard": "^21.0.0",
105 105 "stylelint-order": "^4.1.0",
106 106 "ts-node": "^9.1.1",
107   - "typescript": "4.2.3",
  107 + "typescript": "4.2.4",
108 108 "vite": "2.1.5",
109 109 "vite-plugin-compression": "^0.2.4",
110 110 "vite-plugin-html": "^2.0.6",
111 111 "vite-plugin-imagemin": "^0.3.0",
112 112 "vite-plugin-mock": "^2.5.0",
113 113 "vite-plugin-purge-icons": "^0.7.0",
114   - "vite-plugin-pwa": "^0.6.5",
  114 + "vite-plugin-pwa": "^0.7.0",
115 115 "vite-plugin-style-import": "^0.9.2",
116 116 "vite-plugin-svg-icons": "^0.4.1",
117   - "vite-plugin-theme": "^0.6.0",
  117 + "vite-plugin-theme": "^0.6.1",
118 118 "vite-plugin-windicss": "0.12.5",
119 119 "vue-eslint-parser": "^7.6.0"
120 120 },
... ...
src/components/Icon/src/index.vue
  View file @96a49ba
... ... @@ -24,6 +24,8 @@
24 24 import Iconify from '@purge-icons/generated';
25 25 import { isString } from '/@/utils/is';
26 26 import { propTypes } from '/@/utils/propTypes';
  27 + import { useRootSetting } from '/@/hooks/setting/useRootSetting';
  28 + import { ThemeEnum } from '/@/enums/appEnum';
27 29  
28 30 const SVG_END_WITH_FLAG = '|svg';
29 31 export default defineComponent({
... ... @@ -44,6 +46,8 @@
44 46 setup(props) {
45 47 const elRef = ref<ElRef>(null);
46 48  
  49 + const { getDarkMode } = useRootSetting();
  50 +
47 51 const isSvgIcon = computed(() => props.icon?.endsWith(SVG_END_WITH_FLAG));
48 52 const getSvgIcon = computed(() => props.icon.replace(SVG_END_WITH_FLAG, ''));
49 53 const getIconRef = computed(() => `${props.prefix ? props.prefix + ':' : ''}${props.icon}`);
... ... @@ -78,9 +82,10 @@
78 82 if (isString(size)) {
79 83 fs = parseInt(size, 10);
80 84 }
  85 +
81 86 return {
82 87 fontSize: `${fs}px`,
83   - color,
  88 + color: color || (unref(getDarkMode) === ThemeEnum.DARK ? '#fff' : '#303133'),
84 89 display: 'inline-flex',
85 90 };
86 91 }
... ...
src/hooks/web/useECharts.ts
  View file @96a49ba
... ... @@ -28,7 +28,7 @@ export function useECharts(
28 28 return cacheOptions.value;
29 29 }
30 30 return {
31   - backgroundColor: '#151515',
  31 + backgroundColor: 'transparent',
32 32 ...cacheOptions.value,
33 33 };
34 34 }
... ...
yarn.lock
  View file @96a49ba
... ... @@ -1136,10 +1136,10 @@
1136 1136 dependencies:
1137 1137 cross-fetch "^3.0.6"
1138 1138  
1139   -"@iconify/json@^1.1.325":
1140   - version "1.1.325"
1141   - resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.325.tgz#99127b4b467e04a9817d066a9237fea47fdb8925"
1142   - integrity sha512-lqLTB9p6qQxL9vH794xnY+MIty08vkrUflxLXM2uykH7Pt/LU8Pk5DDd3XgJS/L4lnkBgOuXM27uvejSSGupMw==
  1139 +"@iconify/json@^1.1.327":
  1140 + version "1.1.327"
  1141 + resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.327.tgz#78d021a7f730c01863e56ee5b4c0eaf4ca69db43"
  1142 + integrity sha512-S4Zw/5yqQaGpkYe8ubB+0PRXQl5UZOdsYhvShzI2FSqOjwjhpPG4X6DUTH6WD8oGkCpRa/B7tK9asYefjCax7w==
1143 1143  
1144 1144 "@intlify/core-base@9.0.0":
1145 1145 version "9.0.0"
... ... @@ -1762,18 +1762,18 @@
1762 1762 resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
1763 1763 integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
1764 1764  
1765   -"@vueuse/core@^4.7.0":
1766   - version "4.7.0"
1767   - resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.7.0.tgz#733f4b86832346a014dfdf818e3773ebfcbaebc4"
1768   - integrity sha512-0Kmo+Gqn47aCg6HHFUvXabD/T5haWyC5pk2PEzaGay9dGE7D+sc05Y1h2MylzcFzRX/2G4anOxSuDqmvQ/GunQ==
  1765 +"@vueuse/core@^4.8.0":
  1766 + version "4.8.0"
  1767 + resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.8.0.tgz#d86e36956521c0f9b6571cb58b27f0e2535259b3"
  1768 + integrity sha512-nUH4Hn1DN4kkuF1r5ZcfGnjoAKDD0Kw9oFnt/TUo1aueNijq4KujagtoQN8OC4Pei10TeTDdqhmZAWnaCE1NbA==
1769 1769 dependencies:
1770   - "@vueuse/shared" "4.7.0"
  1770 + "@vueuse/shared" "4.8.0"
1771 1771 vue-demi latest
1772 1772  
1773   -"@vueuse/shared@4.7.0":
1774   - version "4.7.0"
1775   - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.7.0.tgz#b18de574f4b42382441765fb510f26421c3a72ca"
1776   - integrity sha512-a9wmH6g+dh6ALeOejIL53s1HkASyOldbHunwEUEtRdgQyUCnU+RRiYTZlNLEyt1r79kPtnBjp5fHq0X36H96MA==
  1773 +"@vueuse/shared@4.8.0":
  1774 + version "4.8.0"
  1775 + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.8.0.tgz#abf3da96ca81b4be82e885928193fef2c676cdbc"
  1776 + integrity sha512-g1lSbHD4ptiS74qBUvffJ98QjRsoCH7ILjxVzJF488EPAmp5z3taLnoggt6NXfonnYve7fEPuqsJqd2BLOxT1A==
1777 1777 dependencies:
1778 1778 vue-demi latest
1779 1779  
... ... @@ -8811,10 +8811,10 @@ typedarray-to-buffer@^3.1.5:
8811 8811 dependencies:
8812 8812 is-typedarray "^1.0.0"
8813 8813  
8814   -typescript@4.2.3:
8815   - version "4.2.3"
8816   - resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
8817   - integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
  8814 +typescript@4.2.4:
  8815 + version "4.2.4"
  8816 + resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
  8817 + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
8818 8818  
8819 8819 uglify-js@^3.1.4:
8820 8820 version "3.13.1"
... ... @@ -9138,14 +9138,15 @@ vite-plugin-purge-icons@^0.7.0:
9138 9138 "@purge-icons/generated" "^0.7.0"
9139 9139 rollup-plugin-purge-icons "^0.7.0"
9140 9140  
9141   -vite-plugin-pwa@^0.6.5:
9142   - version "0.6.5"
9143   - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.5.tgz#04bb01c7363260bfb6ee8d6b976ef954e23b8adc"
9144   - integrity sha512-OBp1hIuVVwA0gEVCF3RsfaRrZWlIUOS4yYttLpznCH69BoGvgPH8M9qVGMj7/KbMI4+2YbTo7YzwSl+LWHX49A==
  9141 +vite-plugin-pwa@^0.7.0:
  9142 + version "0.7.0"
  9143 + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.7.0.tgz#cde774b2a65dbd84dc8831c964898563f7e2c22c"
  9144 + integrity sha512-Mf7O5Ecubv25nSSdkfpeackVKX9+SOpH7U2I6IFPb/NupG7wn3KzBOke3ksu+bA8GzN5923vD/kw1GWOsLZL4w==
9145 9145 dependencies:
9146 9146 debug "^4.3.2"
9147 9147 fast-glob "^3.2.5"
9148 9148 pretty-bytes "^5.6.0"
  9149 + rollup "^2.44.0"
9149 9150 workbox-build "^6.1.2"
9150 9151 workbox-window "^6.1.2"
9151 9152  
... ... @@ -9172,10 +9173,10 @@ vite-plugin-svg-icons@^0.4.1:
9172 9173 svg-baker "1.7.0"
9173 9174 svgo "^2.3.0"
9174 9175  
9175   -vite-plugin-theme@^0.6.0:
9176   - version "0.6.0"
9177   - resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.0.tgz#7abba80f0f615c245dd7385fdea00b008b89d769"
9178   - integrity sha512-ZG6QLET0QbwGTTXxRQOjXNMKY8iEzUMu0mls4vBIhKc30Rq3NHl6Kxg0Zgd+BvOyQva8joP2fVsxr+1CV4383Q==
  9176 +vite-plugin-theme@^0.6.1:
  9177 + version "0.6.1"
  9178 + resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.1.tgz#8fd87e1d57ae83f49531aeb65bfc8f6adcf2b71f"
  9179 + integrity sha512-r+v+AxeatliReg6fBkCbKQ/PHpv0J9EG22QLoAyXNPdZxei+xydxdHVWrN2nUh231im0v9fZzWKzOOxw5VW0fA==
9179 9180 dependencies:
9180 9181 "@types/node" "^14.14.37"
9181 9182 "@types/tinycolor2" "^1.4.2"
... ... @@ -9225,7 +9226,7 @@ vue-eslint-parser@^7.6.0:
9225 9226 esquery "^1.4.0"
9226 9227 lodash "^4.17.15"
9227 9228  
9228   -vue-i18n@^9.0.0:
  9229 +vue-i18n@9.0.0:
9229 9230 version "9.0.0"
9230 9231 resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.0.0.tgz#a04c41d5ed3d5a068e923517bfaa0abcbc84e174"
9231 9232 integrity sha512-iks0eJDv/4cK/7tl/ooMUroNVVIGOK4kKS1PIHmPQk7QjT/sDfFM84vjPKgpARbw0GjJsOiADL43jufNfs9e9A==
... ...