tsai
/
vue-vben-admin
mirror of https://github.com/vbenjs/vue-vben-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore: update deps

pull/463/head
Vben 6 years ago
parent
af6d58eb26
commit
96a49ba116
5 changed files with 41 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      build/vite/plugin/theme.ts
  2. 12
      package.json
  3. 7
      src/components/Icon/src/index.vue
  4. 2
      src/hooks/web/useECharts.ts
  5. 53
      yarn.lock

7
build/vite/plugin/theme.ts
View File

@ -25,12 +25,7 @@ export function configThemePlugin(isBuild: boolean): Plugin[] {
colorVariables: [...getThemeColors(), ...colors], colorVariables: [...getThemeColors(), ...colors],
}), }),
antdDarkThemePlugin({ antdDarkThemePlugin({
filter: (id) => { filter: (id) => (isBuild ? !id.endsWith('antd.less') : true),
if (isBuild) {
return !id.endsWith('antd.less');
}
return true;
},
// extractCss: false, // extractCss: false,
darkModifyVars: { darkModifyVars: {
...generateModifyVars(true), ...generateModifyVars(true),

12
package.json
View File

@ -32,7 +32,7 @@
}, },
"dependencies": { "dependencies": {
"@iconify/iconify": "^2.0.0-rc.6", "@iconify/iconify": "^2.0.0-rc.6",
"@vueuse/core": "^4.7.0", "@vueuse/core": "^4.8.0",
"@zxcvbn-ts/core": "^0.3.0", "@zxcvbn-ts/core": "^0.3.0",
"ant-design-vue": "^2.1.2", "ant-design-vue": "^2.1.2",
"axios": "^0.21.1", "axios": "^0.21.1",
@ -49,7 +49,7 @@
"tinymce": "^5.7.1", "tinymce": "^5.7.1",
"vditor": "^3.8.4", "vditor": "^3.8.4",
"vue": "3.0.11", "vue": "3.0.11",
"vue-i18n": "^9.0.0", "vue-i18n": "9.0.0",
"vue-router": "^4.0.6", "vue-router": "^4.0.6",
"vue-types": "^3.0.2", "vue-types": "^3.0.2",
"vuex": "^4.0.0", "vuex": "^4.0.0",
@ -59,7 +59,7 @@
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^12.1.1", "@commitlint/cli": "^12.1.1",
"@commitlint/config-conventional": "^12.1.1", "@commitlint/config-conventional": "^12.1.1",
"@iconify/json": "^1.1.325", "@iconify/json": "^1.1.327",
"@purge-icons/generated": "^0.7.0", "@purge-icons/generated": "^0.7.0",
"@types/crypto-js": "^4.0.1", "@types/crypto-js": "^4.0.1",
"@types/fs-extra": "^9.0.10", "@types/fs-extra": "^9.0.10",
@ -104,17 +104,17 @@
"stylelint-config-standard": "^21.0.0", "stylelint-config-standard": "^21.0.0",
"stylelint-order": "^4.1.0", "stylelint-order": "^4.1.0",
"ts-node": "^9.1.1", "ts-node": "^9.1.1",
"typescript": "4.2.3", "typescript": "4.2.4",
"vite": "2.1.5", "vite": "2.1.5",
"vite-plugin-compression": "^0.2.4", "vite-plugin-compression": "^0.2.4",
"vite-plugin-html": "^2.0.6", "vite-plugin-html": "^2.0.6",
"vite-plugin-imagemin": "^0.3.0", "vite-plugin-imagemin": "^0.3.0",
"vite-plugin-mock": "^2.5.0", "vite-plugin-mock": "^2.5.0",
"vite-plugin-purge-icons": "^0.7.0", "vite-plugin-purge-icons": "^0.7.0",
"vite-plugin-pwa": "^0.6.5", "vite-plugin-pwa": "^0.7.0",
"vite-plugin-style-import": "^0.9.2", "vite-plugin-style-import": "^0.9.2",
"vite-plugin-svg-icons": "^0.4.1", "vite-plugin-svg-icons": "^0.4.1",
"vite-plugin-theme": "^0.6.0", "vite-plugin-theme": "^0.6.1",
"vite-plugin-windicss": "0.12.5", "vite-plugin-windicss": "0.12.5",
"vue-eslint-parser": "^7.6.0" "vue-eslint-parser": "^7.6.0"
}, },

7
src/components/Icon/src/index.vue
View File

@ -24,6 +24,8 @@
import Iconify from '@purge-icons/generated'; import Iconify from '@purge-icons/generated';
import { isString } from '/@/utils/is'; import { isString } from '/@/utils/is';
import { propTypes } from '/@/utils/propTypes'; import { propTypes } from '/@/utils/propTypes';
import { useRootSetting } from '/@/hooks/setting/useRootSetting';
import { ThemeEnum } from '/@/enums/appEnum';
const SVG_END_WITH_FLAG = '|svg'; const SVG_END_WITH_FLAG = '|svg';
export default defineComponent({ export default defineComponent({
@ -44,6 +46,8 @@
setup(props) { setup(props) {
const elRef = ref<ElRef>(null); const elRef = ref<ElRef>(null);
const { getDarkMode } = useRootSetting();
const isSvgIcon = computed(() => props.icon?.endsWith(SVG_END_WITH_FLAG)); const isSvgIcon = computed(() => props.icon?.endsWith(SVG_END_WITH_FLAG));
const getSvgIcon = computed(() => props.icon.replace(SVG_END_WITH_FLAG, '')); const getSvgIcon = computed(() => props.icon.replace(SVG_END_WITH_FLAG, ''));
const getIconRef = computed(() => `${props.prefix ? props.prefix + ':' : ''}${props.icon}`); const getIconRef = computed(() => `${props.prefix ? props.prefix + ':' : ''}${props.icon}`);
@ -78,9 +82,10 @@
if (isString(size)) { if (isString(size)) {
fs = parseInt(size, 10); fs = parseInt(size, 10);
} }
return { return {
fontSize: `${fs}px`, fontSize: `${fs}px`,
color, color: color || (unref(getDarkMode) === ThemeEnum.DARK ? '#fff' : '#303133'),
display: 'inline-flex', display: 'inline-flex',
}; };
} }

2
src/hooks/web/useECharts.ts
View File

@ -28,7 +28,7 @@ export function useECharts(
return cacheOptions.value; return cacheOptions.value;
} }
return { return {
backgroundColor: '#151515', backgroundColor: 'transparent',
...cacheOptions.value, ...cacheOptions.value,
}; };
} }

53
yarn.lock
View File

@ -1136,10 +1136,10 @@
dependencies: dependencies:
cross-fetch "^3.0.6" cross-fetch "^3.0.6"
"@iconify/json@^1.1.325": "@iconify/json@^1.1.327":
version "1.1.325" version "1.1.327"
resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.325.tgz#99127b4b467e04a9817d066a9237fea47fdb8925" resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.327.tgz#78d021a7f730c01863e56ee5b4c0eaf4ca69db43"
integrity sha512-lqLTB9p6qQxL9vH794xnY+MIty08vkrUflxLXM2uykH7Pt/LU8Pk5DDd3XgJS/L4lnkBgOuXM27uvejSSGupMw== integrity sha512-S4Zw/5yqQaGpkYe8ubB+0PRXQl5UZOdsYhvShzI2FSqOjwjhpPG4X6DUTH6WD8oGkCpRa/B7tK9asYefjCax7w==
"@intlify/core-base@9.0.0": "@intlify/core-base@9.0.0":
version "9.0.0" version "9.0.0"
@ -1762,18 +1762,18 @@
resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA== integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
"@vueuse/core@^4.7.0": "@vueuse/core@^4.8.0":
version "4.7.0" version "4.8.0"
resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.7.0.tgz#733f4b86832346a014dfdf818e3773ebfcbaebc4" resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.8.0.tgz#d86e36956521c0f9b6571cb58b27f0e2535259b3"
integrity sha512-0Kmo+Gqn47aCg6HHFUvXabD/T5haWyC5pk2PEzaGay9dGE7D+sc05Y1h2MylzcFzRX/2G4anOxSuDqmvQ/GunQ== integrity sha512-nUH4Hn1DN4kkuF1r5ZcfGnjoAKDD0Kw9oFnt/TUo1aueNijq4KujagtoQN8OC4Pei10TeTDdqhmZAWnaCE1NbA==
dependencies: dependencies:
"@vueuse/shared" "4.7.0" "@vueuse/shared" "4.8.0"
vue-demi latest vue-demi latest
"@vueuse/shared@4.7.0": "@vueuse/shared@4.8.0":
version "4.7.0" version "4.8.0"
resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.7.0.tgz#b18de574f4b42382441765fb510f26421c3a72ca" resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.8.0.tgz#abf3da96ca81b4be82e885928193fef2c676cdbc"
integrity sha512-a9wmH6g+dh6ALeOejIL53s1HkASyOldbHunwEUEtRdgQyUCnU+RRiYTZlNLEyt1r79kPtnBjp5fHq0X36H96MA== integrity sha512-g1lSbHD4ptiS74qBUvffJ98QjRsoCH7ILjxVzJF488EPAmp5z3taLnoggt6NXfonnYve7fEPuqsJqd2BLOxT1A==
dependencies: dependencies:
vue-demi latest vue-demi latest
@ -8811,10 +8811,10 @@ typedarray-to-buffer@^3.1.5:
dependencies: dependencies:
is-typedarray "^1.0.0" is-typedarray "^1.0.0"
typescript@4.2.3: typescript@4.2.4:
version "4.2.3" version "4.2.4"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
uglify-js@^3.1.4: uglify-js@^3.1.4:
version "3.13.1" version "3.13.1"
@ -9138,14 +9138,15 @@ vite-plugin-purge-icons@^0.7.0:
"@purge-icons/generated" "^0.7.0" "@purge-icons/generated" "^0.7.0"
rollup-plugin-purge-icons "^0.7.0" rollup-plugin-purge-icons "^0.7.0"
vite-plugin-pwa@^0.6.5: vite-plugin-pwa@^0.7.0:
version "0.6.5" version "0.7.0"
resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.5.tgz#04bb01c7363260bfb6ee8d6b976ef954e23b8adc" resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.7.0.tgz#cde774b2a65dbd84dc8831c964898563f7e2c22c"
integrity sha512-OBp1hIuVVwA0gEVCF3RsfaRrZWlIUOS4yYttLpznCH69BoGvgPH8M9qVGMj7/KbMI4+2YbTo7YzwSl+LWHX49A== integrity sha512-Mf7O5Ecubv25nSSdkfpeackVKX9+SOpH7U2I6IFPb/NupG7wn3KzBOke3ksu+bA8GzN5923vD/kw1GWOsLZL4w==
dependencies: dependencies:
debug "^4.3.2" debug "^4.3.2"
fast-glob "^3.2.5" fast-glob "^3.2.5"
pretty-bytes "^5.6.0" pretty-bytes "^5.6.0"
rollup "^2.44.0"
workbox-build "^6.1.2" workbox-build "^6.1.2"
workbox-window "^6.1.2" workbox-window "^6.1.2"
@ -9172,10 +9173,10 @@ vite-plugin-svg-icons@^0.4.1:
svg-baker "1.7.0" svg-baker "1.7.0"
svgo "^2.3.0" svgo "^2.3.0"
vite-plugin-theme@^0.6.0: vite-plugin-theme@^0.6.1:
version "0.6.0" version "0.6.1"
resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.0.tgz#7abba80f0f615c245dd7385fdea00b008b89d769" resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.6.1.tgz#8fd87e1d57ae83f49531aeb65bfc8f6adcf2b71f"
integrity sha512-ZG6QLET0QbwGTTXxRQOjXNMKY8iEzUMu0mls4vBIhKc30Rq3NHl6Kxg0Zgd+BvOyQva8joP2fVsxr+1CV4383Q== integrity sha512-r+v+AxeatliReg6fBkCbKQ/PHpv0J9EG22QLoAyXNPdZxei+xydxdHVWrN2nUh231im0v9fZzWKzOOxw5VW0fA==
dependencies: dependencies:
"@types/node" "^14.14.37" "@types/node" "^14.14.37"
"@types/tinycolor2" "^1.4.2" "@types/tinycolor2" "^1.4.2"
@ -9225,7 +9226,7 @@ vue-eslint-parser@^7.6.0:
esquery "^1.4.0" esquery "^1.4.0"
lodash "^4.17.15" lodash "^4.17.15"
vue-i18n@^9.0.0: vue-i18n@9.0.0:
version "9.0.0" version "9.0.0"
resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.0.0.tgz#a04c41d5ed3d5a068e923517bfaa0abcbc84e174" resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.0.0.tgz#a04c41d5ed3d5a068e923517bfaa0abcbc84e174"
integrity sha512-iks0eJDv/4cK/7tl/ooMUroNVVIGOK4kKS1PIHmPQk7QjT/sDfFM84vjPKgpARbw0GjJsOiADL43jufNfs9e9A== integrity sha512-iks0eJDv/4cK/7tl/ooMUroNVVIGOK4kKS1PIHmPQk7QjT/sDfFM84vjPKgpARbw0GjJsOiADL43jufNfs9e9A==

Write Preview
Loading…
Cancel
Save