diff --git a/build/config/themeConfig.ts b/build/config/themeConfig.ts index 24fe9038e4855f2e52e0b0f55772459cc220d7c3..6e36426093b445385ed58698ddf258044535abaf 100644 --- a/build/config/themeConfig.ts +++ b/build/config/themeConfig.ts @@ -2,6 +2,8 @@ import { generate } from '@ant-design/colors'; export const primaryColor = '#0960bd'; +export const borderColorBase = '#d9d9d9'; + export const themeMode = 'light'; export type ThemeMode = 'dark' | 'light'; @@ -97,7 +99,7 @@ export function generateModifyVars() { 'text-color-secondary': 'rgba(0, 0, 0, 0.45)', // Subtext color 'font-size-base': '14px', // Main font size 'box-shadow-base': '0 2px 8px rgba(0, 0, 0, 0.15)', // Floating shadow - 'border-color-base': '#d9d9d9', // Border color, + 'border-color-base': borderColorBase, // Border color, 'border-radius-base': '2px', // Component/float fillet 'link-color': primary, // Link color }; diff --git a/package.json b/package.json index 54e7a6a52a310190de6cfbbd7f4abf36a2615a9e..303b359b57c07801f6079d81f6f6f4d06f1bb576 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@iconify/iconify": "^2.0.0-rc.6", "@vueuse/core": "^4.6.2", "@zxcvbn-ts/core": "^0.3.0", - "ant-design-vue": "2.1.1", + "ant-design-vue": "^2.1.2", "apexcharts": "^3.26.0", "axios": "^0.21.1", "crypto-js": "^4.0.0", @@ -47,7 +47,7 @@ "qrcode": "^1.4.4", "sortablejs": "^1.13.0", "vditor": "^3.8.4", - "vue": "^3.0.9", + "vue": "3.0.7", "vue-i18n": "^9.0.0", "vue-router": "^4.0.5", "vue-types": "^3.0.2", @@ -75,7 +75,7 @@ "@vitejs/plugin-legacy": "^1.3.2", "@vitejs/plugin-vue": "^1.2.0", "@vitejs/plugin-vue-jsx": "^1.1.2", - "@vue/compiler-sfc": "^3.0.9", + "@vue/compiler-sfc": "3.0.7", "autoprefixer": "^10.2.5", "body-parser": "^1.19.0", "commitizen": "^4.2.3", @@ -112,11 +112,11 @@ "vite-plugin-imagemin": "^0.2.9", "vite-plugin-mock": "^2.4.0", "vite-plugin-purge-icons": "^0.7.0", - "vite-plugin-pwa": "^0.6.3", - "vite-plugin-style-import": "^0.9.0", + "vite-plugin-pwa": "^0.6.4", + "vite-plugin-style-import": "^0.9.1", "vite-plugin-svg-icons": "^0.4.0", "vite-plugin-theme": "^0.5.0", - "vite-plugin-windicss": "0.10.2", + "vite-plugin-windicss": "0.10.4", "vue-eslint-parser": "^7.6.0" }, "resolutions": { diff --git a/src/components/Basic/src/BasicTitle.vue b/src/components/Basic/src/BasicTitle.vue index 2484a7db46e6da3160a278bfa93e09d44184534f..47ec63ac123063f49708b88f095eddbb9a3b4f88 100644 --- a/src/components/Basic/src/BasicTitle.vue +++ b/src/components/Basic/src/BasicTitle.vue @@ -1,5 +1,5 @@ - diff --git a/src/components/Container/src/ScrollContainer.vue b/src/components/Container/src/ScrollContainer.vue index f678057130c08fecd6287856eca4181a73d428f0..e85debdd547e164343c88a46cfd3c64e53234183 100644 --- a/src/components/Container/src/ScrollContainer.vue +++ b/src/components/Container/src/ScrollContainer.vue @@ -12,18 +12,21 @@ export default defineComponent({ name: 'ScrollContainer', - // inheritAttrs: false, components: { Scrollbar }, setup() { const scrollbarRef = ref>(null); function scrollTo(to: number, duration = 500) { const scrollbar = unref(scrollbarRef); - if (!scrollbar) return; + if (!scrollbar) { + return; + } nextTick(() => { const wrap = unref(scrollbar.wrap); - if (!wrap) return; + if (!wrap) { + return; + } const { start } = useScrollTo({ el: wrap, to, @@ -35,17 +38,23 @@ function getScrollWrap() { const scrollbar = unref(scrollbarRef); - if (!scrollbar) return null; + if (!scrollbar) { + return null; + } return scrollbar.wrap; } function scrollBottom() { const scrollbar = unref(scrollbarRef); - if (!scrollbar) return; + if (!scrollbar) { + return; + } nextTick(() => { const wrap = unref(scrollbar.wrap); - if (!wrap) return; + if (!wrap) { + return; + } const scrollHeight = wrap.scrollHeight as number; const { start } = useScrollTo({ el: wrap, diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue index 007e36d6dd2ebb9fb02705adb8a04af80df67b73..15b248897669058a7fad81b0fa5e500dd4a97748 100644 --- a/src/components/Container/src/collapse/CollapseContainer.vue +++ b/src/components/Container/src/collapse/CollapseContainer.vue @@ -1,29 +1,24 @@ - diff --git a/src/design/transition/index.less b/src/design/transition/index.less index 1d44b14847be2888571ca467c6d127712dddde60..e372b259e423cd1eebe204439b90f91746bdd398 100644 --- a/src/design/transition/index.less +++ b/src/design/transition/index.less @@ -4,3 +4,7 @@ @import './slide.less'; @import './scroll.less'; @import './zoom.less'; + +.collapse-transition { + transition: 0.2s height ease-in-out, 0.2s padding-top ease-in-out, 0.2s padding-bottom ease-in-out; +} diff --git a/src/views/demo/comp/transition/index.vue b/src/views/demo/comp/transition/index.vue index c6a3d390d4d682597b2645ec24edc6ca60a54656..02e164c79c5a956dd6ab998ca8626d5cd59acf53 100644 --- a/src/views/demo/comp/transition/index.vue +++ b/src/views/demo/comp/transition/index.vue @@ -32,7 +32,7 @@ ScaleRotateTransition, ExpandXTransition, ExpandTransition, - } from '/@/components/Transition/index'; + } from '/@/components/Transition'; const transitionList = [ 'Fade', diff --git a/yarn.lock b/yarn.lock index 7d1b4e021ef9204b95ec2dfd57585a1e4afc0cc8..5478d69fd5d39facbdac8563a7bf42c2bb0de02b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -297,11 +297,6 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88" integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q== -"@babel/parser@^7.13.9": - version "7.13.13" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" - integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== - "@babel/plugin-proposal-async-generator-functions@^7.13.8": version "7.13.8" resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" @@ -1995,17 +1990,6 @@ estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-core@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.9.tgz#ec7efa676889aee006fc43739ee4a67a952ac623" - integrity sha512-bHAPwfVoLhGx8d6KV/OfGf/3gwpymVirgfmSyhgv5YuXDybLa6BwjSLvhNMAyDP+4q4pp0p6g248LuoOy5W6OA== - dependencies: - "@babel/parser" "^7.12.0" - "@babel/types" "^7.12.0" - "@vue/shared" "3.0.9" - estree-walker "^2.0.1" - source-map "^0.6.1" - "@vue/compiler-dom@3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.7.tgz#54d2e12fb9a7aff53abd19dac2c2679533f0c919" @@ -2014,25 +1998,17 @@ "@vue/compiler-core" "3.0.7" "@vue/shared" "3.0.7" -"@vue/compiler-dom@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.9.tgz#1fd554097d9ab36eca73bc6d0d9607fecf94e71c" - integrity sha512-tkq6umPSELaghvOExWfGNwrCRc7FTul3RLykKzBZWhb87sSESq0XxiKELfBOfEbzdhWg6BJ1WXKDeq+al/viEQ== - dependencies: - "@vue/compiler-core" "3.0.9" - "@vue/shared" "3.0.9" - -"@vue/compiler-sfc@^3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.9.tgz#0f993a6e159ca6ad351d8ee0c4734771d2590115" - integrity sha512-meneFRb9xIDgv/gYWCr9xKryvPi0tVffQzLjCkyN4RF1EndqLS71xugUX9wQsS4F1SAP+zlZbcgMFmTSC4OpHw== +"@vue/compiler-sfc@3.0.7": + version "3.0.7" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.7.tgz#900414750cc726553b870490f48073451fd14f07" + integrity sha512-37/QILpGE+J3V+bP9Slg9e6xGqfk+MmS2Yj8ChR4fS0/qWUU/YoYHE0GPIzjmBdH0JVOOmJqunxowIXmqNiHng== dependencies: - "@babel/parser" "^7.13.9" - "@babel/types" "^7.13.0" - "@vue/compiler-core" "3.0.9" - "@vue/compiler-dom" "3.0.9" - "@vue/compiler-ssr" "3.0.9" - "@vue/shared" "3.0.9" + "@babel/parser" "^7.12.0" + "@babel/types" "^7.12.0" + "@vue/compiler-core" "3.0.7" + "@vue/compiler-dom" "3.0.7" + "@vue/compiler-ssr" "3.0.7" + "@vue/shared" "3.0.7" consolidate "^0.16.0" estree-walker "^2.0.1" hash-sum "^2.0.0" @@ -2044,13 +2020,13 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-ssr@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.9.tgz#aebce25e573b9db34964b682bb1631a7240ba43d" - integrity sha512-99h5k6Up+s8AzTNH1ljtXE/QlnG8yaGLePwQ4XQaWfk23ESUnmGZWEC+y+ZXznf8pIfJ0uPeD9EVgQzQAyZ2aA== +"@vue/compiler-ssr@3.0.7": + version "3.0.7" + resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.7.tgz#28b85d497381d75fe44234057b140b0065ca9dbf" + integrity sha512-nHRbHeSpfXwjypettjrA16TjgfDcPEwq3m/zHnGyLC1QqdLtklXmpSM43/CPwwTCRa/qdt0pldJf22MiCEuTSQ== dependencies: - "@vue/compiler-dom" "3.0.9" - "@vue/shared" "3.0.9" + "@vue/compiler-dom" "3.0.7" + "@vue/shared" "3.0.7" "@vue/devtools-api@^6.0.0-beta.5": version "6.0.0-beta.7" @@ -2064,13 +2040,6 @@ dependencies: "@vue/shared" "3.0.7" -"@vue/reactivity@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.9.tgz#875f241b8c10262560b190ccdeff2d0ab7053e11" - integrity sha512-W1AbGhzphVjY+TL32lQDwLDNvLzZKOcUgaIaLOoALWMtjzN4ExOUJzrR1FC3ynlpMHIEfcUo8GPgfnNmvMGdgQ== - dependencies: - "@vue/shared" "3.0.9" - "@vue/runtime-core@3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.7.tgz#d44c0b0a57d7e392912a87362a4430ccf446ecea" @@ -2079,14 +2048,6 @@ "@vue/reactivity" "3.0.7" "@vue/shared" "3.0.7" -"@vue/runtime-core@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.9.tgz#9665f149468355a524a304cb8f260147a4d294e6" - integrity sha512-j94xZ/wRZTVhqpoUgmxBTlojnPFu6TTXNw1Vw8oQkW1ZTGD0IwiJe3ycsKd1bpleXEMVt55GzGlCopI33/Gdmg== - dependencies: - "@vue/reactivity" "3.0.9" - "@vue/shared" "3.0.9" - "@vue/runtime-dom@3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.7.tgz#b70668d729020bc4ad608c20367223f259576ba6" @@ -2096,25 +2057,11 @@ "@vue/shared" "3.0.7" csstype "^2.6.8" -"@vue/runtime-dom@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.9.tgz#16a1d001dc746a9f346ee7fb9de90d52ad097b61" - integrity sha512-6NCjpwa5hNBFDdokquAgMl2tNEYyQD6kBy9Mh6M2776bxYLXZCqL4/e0UrpBuBiHTrkAlUGODD7PyYGaqH6fyA== - dependencies: - "@vue/runtime-core" "3.0.9" - "@vue/shared" "3.0.9" - csstype "^2.6.8" - "@vue/shared@3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.7.tgz#96d52988efc07444c108c7c6803ba7cc93e40045" integrity sha512-dn5FyfSc4ky424jH4FntiHno7Ss5yLkqKNmM/NXwANRnlkmqu74pnGetexDFVG5phMk9/FhwovUZCWGxsotVKg== -"@vue/shared@3.0.9": - version "3.0.9" - resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.9.tgz#09882d745ded52b07e4481d036659d733edd2a9a" - integrity sha512-lv20q1O5dybwro+V+vnxHCmSIxi9mvTORSgAbGrANGYK8zF4K1S9TOankIvdkcvfZ88IR95O2pTI2Pb3c3BaNg== - "@vueuse/core@^4.6.2": version "4.6.2" resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.6.2.tgz#73a07ddbb3d01c66ef7d79500190f25a7ca7afac" @@ -2130,16 +2077,18 @@ dependencies: vue-demi latest -"@windicss/plugin-utils@0.10.2": - version "0.10.2" - resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.10.2.tgz#d4a79c41f02c1704b54510a2bd2deaa43c905a7d" - integrity sha512-IeKaZEZ1Ww3KO5C3AxWLotMX3aGxhrj0MsTmiyMS1H5KXm6HOgfk+zsRiB0ysxGKrGZ4pMLe2H3Riku8o7YfuQ== +"@windicss/plugin-utils@0.10.4": + version "0.10.4" + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.10.4.tgz#ed9163b09e030f7358cc4742b1f2b6c92d084d5d" + integrity sha512-jQu69qzA56Lv18OK8U4mUTDV17st4EdPawQuaRG2VNK+ZEQWYsMNnqGxhzDTl/NhWTGCcTb3D6mlFPNo0QDOFg== dependencies: debug "^4.3.2" fast-glob "^3.2.5" + magic-string "^0.25.7" micromatch "^4.0.2" + pirates "^4.0.1" sucrase "^3.17.1" - windicss "^2.5.5" + windicss "^2.5.7" "@zxcvbn-ts/core@^0.3.0": version "0.3.0" @@ -2284,10 +2233,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ant-design-vue@2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.1.1.tgz#5c2f3d86177e197f6dbb167f691a9d10104e61c3" - integrity sha512-ohTEIBFRkODRTFXRHeizL/uKNOZY5+4r2y/GXiKEdvrxiTRgHgDNMWKsncG/+G6MXxOIe2Reg+r8jHS8nGDqtQ== +ant-design-vue@^2.1.2: + version "2.1.2" + resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.1.2.tgz#2065d7e63199c0c584919458af57b6a0b597f677" + integrity sha512-gDG0wauGVt4LE63behrJaIcq4BB+dgs+dpj9jz17IgKr2MPYSEeKetU/x9Kk8d58cGonz4Ulncg7fBZJ7EljsQ== dependencies: "@ant-design-vue/use" "^0.0.1-0" "@ant-design/icons-vue" "^6.0.0" @@ -10987,10 +10936,10 @@ vite-plugin-purge-icons@^0.7.0: "@purge-icons/generated" "^0.7.0" rollup-plugin-purge-icons "^0.7.0" -vite-plugin-pwa@^0.6.3: - version "0.6.3" - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.3.tgz#91c0481e1c7f89b9c4502c582b2d25ea73aac311" - integrity sha512-wZxE2ZAKpwaig2JFOm6ama8p2iHBUZuHLEko1co7zDdnb6C/Epmih5aCIyHHvZKcFEaUxFogLQCnRDD41vd5cw== +vite-plugin-pwa@^0.6.4: + version "0.6.4" + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.4.tgz#50294b67c545c689d9e234e266e042a68ddb9c56" + integrity sha512-YEKloivP8400uax8aqfYN2ygYjfok9xD/VgM9fyi1KVtP2JAgZKNPZnBc66HyaKPPDPr1TCeeXvB+aCSDSznqw== dependencies: debug "^4.3.2" fast-glob "^3.2.5" @@ -10998,10 +10947,10 @@ vite-plugin-pwa@^0.6.3: workbox-build "^6.1.2" workbox-window "^6.1.2" -vite-plugin-style-import@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.9.0.tgz#4adc4456374ba0e87b7a178b59dce6f9fa7f6cd9" - integrity sha512-4Y8Px2t4IXnr6SqjPyAju3sELkV5UcwwoxkxsYkZOQRxHv2gtBUAsBuuQ8xTZNxbic4ODS+H/Z99UgtjNiDekw== +vite-plugin-style-import@^0.9.1: + version "0.9.1" + resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.9.1.tgz#259a0358c20628e9814cc6c4cf25f389b5761945" + integrity sha512-qQmeglG+3kYjHPq+XhyKOsXrKm1k3zLcEicTeFKcU+mbzhQA6lCaIn9EpBgAd7mSBF5HDiMNClCfpoSkShJMyw== dependencies: "@rollup/pluginutils" "^4.1.0" change-case "^4.1.2" @@ -11051,15 +11000,15 @@ vite-plugin-theme@^0.5.0: tinycolor2 "^1.4.2" ts-jest "^26.5.3" -vite-plugin-windicss@0.10.2: - version "0.10.2" - resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.10.2.tgz#126edae552f2bec22273f5f533806e2b5d61c8ff" - integrity sha512-+kgzjwW6VNFlMlQvN4C5iCIqCAhSmTLteVz9IA7LjnpyM6X4tpZmWiTiNlLzAeiJt1eUpu9lFcA7GfuZR+OQDA== +vite-plugin-windicss@0.10.4: + version "0.10.4" + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.10.4.tgz#e93577111ea0a55befbe4e2aa2e596f55f6b74b2" + integrity sha512-P7alH2dGGw3OTgjs9yZG2w0i+o1HKD8PChwhm2ftP+lLCe1xDL3LReheuRil9p2xPYzrVouER2YTbIdLUEThrQ== dependencies: - "@windicss/plugin-utils" "0.10.2" + "@windicss/plugin-utils" "0.10.4" chalk "^4.1.0" debug "^4.3.2" - windicss "^2.5.5" + windicss "^2.5.7" vite@2.1.3: version "2.1.3" @@ -11111,7 +11060,7 @@ vue-types@^3.0.0, vue-types@^3.0.2: dependencies: is-plain-object "3.0.1" -vue@^3.0.0: +vue@3.0.7, vue@^3.0.0: version "3.0.7" resolved "https://registry.npmjs.org/vue/-/vue-3.0.7.tgz#8bcff51f8be570f9e4ce8cc5f52e2ab0fe3c74a1" integrity sha512-8h4TikD+JabbMK9aRlBO4laG0AtNHRPHynxYgWZ9sq1YUPfzynd9Jeeb27XNyZytC7aCQRX9xe1+TQJuc181Tw== @@ -11120,15 +11069,6 @@ vue@^3.0.0: "@vue/runtime-dom" "3.0.7" "@vue/shared" "3.0.7" -vue@^3.0.9: - version "3.0.9" - resolved "https://registry.npmjs.org/vue/-/vue-3.0.9.tgz#c68ffc0e4aa2b0f1905124a9037b6e352de469ad" - integrity sha512-MOvqDpvDslMWJo5kyGW1nTsTIPAuSzgVqmlzSQInIEqkHOu16pNbXuTjnG7jc/yIvQYFSQZqv6Pvad0iO5QkyQ== - dependencies: - "@vue/compiler-dom" "3.0.9" - "@vue/runtime-dom" "3.0.9" - "@vue/shared" "3.0.9" - vuex-module-decorators@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/vuex-module-decorators/-/vuex-module-decorators-1.0.1.tgz#d34dafb5428a3636f1c26d3d014c15fc9659ccd0" @@ -11242,10 +11182,10 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -windicss@^2.5.5: - version "2.5.5" - resolved "https://registry.npmjs.org/windicss/-/windicss-2.5.5.tgz#691cc08e13dc9ee41293cd20cfdb6fed101e1d6a" - integrity sha512-tKLYY9qQoFKoxitG2B8toa9QUPAjsBOKjmFrxhDi2i0eaVOFQh+YEPElBCa7N5ma03YVIW9HPVbgVU0Z4JxZ5g== +windicss@^2.5.7: + version "2.5.7" + resolved "https://registry.npmjs.org/windicss/-/windicss-2.5.7.tgz#aea36568cfb412e1c673468496e920f21ef06086" + integrity sha512-gsWZkotmw9Hr7yZy2nJAp46pmgMO1wXFFa3rfLWm57KDM31U/AucksQnwZi7zxsKM9c6O/z/61/Uvv4J096zKA== wmf@~1.0.1: version "1.0.2"