From 0a9a72f513142fbcac40c533bddb5c9e24262869 Mon Sep 17 00:00:00 2001 From: BluesYoung-web <15171255945@163.com> Date: Tue, 28 Dec 2021 19:05:53 +0800 Subject: [PATCH 01/24] =?UTF-8?q?chore:=20:hammer:=20=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 +++++------ yarn.lock | 61 +++++++++++++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 8ff3d2e..406a4e7 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "xlsx": "^0.17.4" }, "devDependencies": { - "@iconify/json": "^1.1.447", + "@iconify/json": "^1.1.448", "@types/file-saver": "^2.0.4", "@types/js-cookie": "^3.0.1", "@types/md5": "^2.3.1", @@ -59,14 +59,14 @@ "sass": "^1.45.1", "shelljs": "^0.8.4", "typescript": "^4.5.4", - "unplugin-auto-import": "^0.5.4", - "unplugin-icons": "^0.12.23", - "unplugin-vue-components": "^0.17.10", - "vite": "2.7.6", + "unplugin-auto-import": "^0.5.5", + "unplugin-icons": "^0.13.0", + "unplugin-vue-components": "^0.17.11", + "vite": "2.7.8", "vite-plugin-optimize-persist": "^0.1.2", "vite-plugin-package-config": "^0.1.1", "vite-plugin-windicss": "^1.6.1", - "windicss": "^3.4.0" + "windicss": "^3.4.1" }, "keywords": [ "vue3", diff --git a/yarn.lock b/yarn.lock index 5f455d6..6f86afb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,6 +17,13 @@ dependencies: "@types/throttle-debounce" "^2.1.0" +"@antfu/utils@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.4.0.tgz#df100ed9922d7359bf6c99083765b5207086b9a7" + integrity sha512-gqkpvjkgFUu+s3kP+Ly33OKpo5zvVY3FDFhv5BIb98SncS3KD6DNxPfNDjwHIoyXbz1leWo1j8DtRLZ1D2Jv+Q== + dependencies: + "@types/throttle-debounce" "^2.1.0" + "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.12.13.tgz" @@ -440,10 +447,10 @@ resolved "https://registry.yarnpkg.com/@element-plus/icons/-/icons-0.0.11.tgz#9b187c002774548b911850d17fa5fc2f9a515f57" integrity sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A== -"@iconify/json@^1.1.447": - version "1.1.447" - resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.447.tgz#cd1b47cb03883b3d1a9e9b218407e8194613e3b0" - integrity sha512-m7HsDy0+ZHEDh1LWFf7k3qIkRpGJ7ktPffT647qeJXysqGZo0ToBn14arhoIsDIn50M/F83iLt0CeZiyFmxrHA== +"@iconify/json@^1.1.448": + version "1.1.448" + resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.448.tgz#e23f5987f68c86b9a220f50da398adea8a687449" + integrity sha512-DzgNtx6THsRjIRzy8F68gJEfRxBTnfGoCvSmBdNtV/OF/sTEBDMl0q0WPnVbhQb/dalJGGBnscltao6BkMdUAQ== "@iconify/types@^1.0.12": version "1.0.12" @@ -1626,11 +1633,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -kolorist@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.5.0.tgz#a06f7dd11d1b5fdb743d79c8acd4e1ecbcbd89b3" - integrity sha512-pPobydIHK884YBtkS/tWSZXpSAEpcMbilyun3KL37ot935qL2HNKm/tI45i/Rd+MxdIWEhm7/LmUQzWZYK+Qhg== - kolorist@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.5.1.tgz#c3d66dc4fabde4f6b7faa6efda84c00491f9e52b" @@ -2200,10 +2202,10 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unplugin-auto-import@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/unplugin-auto-import/-/unplugin-auto-import-0.5.4.tgz#7a75939bdaf58c79d30d8cfa4c1d45f5b34a1476" - integrity sha512-OxRsAGtg0yAYvJy8Sv5itAPt7erL2ya3gZeKTtpoY1miqOSOhGi8in3qHbov/kMejCxsXhvX39XWlIoMWVNR3Q== +unplugin-auto-import@^0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/unplugin-auto-import/-/unplugin-auto-import-0.5.5.tgz#502f47269efdaeb269d54e3e2707634ac9b6a31b" + integrity sha512-PAP/6WdqWtGhlQBvlVZ7qmhHbLcTYSsARtFSbY/jaUx/SaQkRT7SvronHIKEvx4bPmS+l4erQ9gQKSBBPzvUnQ== dependencies: "@antfu/utils" "^0.3.0" "@rollup/pluginutils" "^4.1.2" @@ -2212,23 +2214,23 @@ unplugin-auto-import@^0.5.4: resolve "^1.20.0" unplugin "^0.2.21" -unplugin-icons@^0.12.23: - version "0.12.23" - resolved "https://registry.yarnpkg.com/unplugin-icons/-/unplugin-icons-0.12.23.tgz#c54c83bed6ad46632b26cd864d4d3a0c085641cf" - integrity sha512-jhCogt+/3WEdPrfHkUGwiLnNJAOrE469J/Zlsh57KAaeEDxrw+PMqXDXRFA/fZjtal/btGPFcDOeQPPHGW6JHg== +unplugin-icons@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/unplugin-icons/-/unplugin-icons-0.13.0.tgz#9bb2e75c61609dae86938044186288590bb990ba" + integrity sha512-CyAl0HV3bZUGT7ut9agpPRhEYXCvufr80Fh72yrkD57BVCTZ7ze10Rt63ZrvPXiJQpd+aI/Bizm2aqOf3WPSfg== dependencies: "@antfu/install-pkg" "^0.1.0" - "@antfu/utils" "^0.3.0" + "@antfu/utils" "^0.4.0" "@iconify/utils" "^1.0.20" debug "^4.3.3" - kolorist "^1.5.0" + kolorist "^1.5.1" local-pkg "^0.4.0" unplugin "^0.2.21" -unplugin-vue-components@^0.17.10: - version "0.17.10" - resolved "https://registry.yarnpkg.com/unplugin-vue-components/-/unplugin-vue-components-0.17.10.tgz#232f0d9bbf3e6bd2747c1b44e3013cd4876afac2" - integrity sha512-7FXgLcDl+ZOFqezlSVPs+t4vP7hV3FhR+nOJs6IpkX7zBWHKNy1YeHSBn+By1p8vBbLLDRYDxL11KQqjrwPK3Q== +unplugin-vue-components@^0.17.11: + version "0.17.11" + resolved "https://registry.yarnpkg.com/unplugin-vue-components/-/unplugin-vue-components-0.17.11.tgz#ce5ba9692236cdcfa6750c4c7ad999747c3c2db4" + integrity sha512-u5MQ0TbikszRelCt6EA/HskGtGkGLDxi7tQ4/4tcEPWkH3yXSZRJCOeLF5MSdxN1SiGjaJ0I9zeHjoZFC3FvRw== dependencies: "@antfu/utils" "^0.3.0" "@rollup/pluginutils" "^4.1.1" @@ -2278,10 +2280,10 @@ vite-plugin-windicss@^1.6.1: kolorist "^1.5.1" windicss "^3.4.0" -vite@2.7.6: - version "2.7.6" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.7.6.tgz#766c7524d27ba21ff27ab37aaffba7abf2e72917" - integrity sha512-PBNoc87rDYLtkpFU9dbVeGdbcyKzz6c34oScqivE3FEa3BhVa4ASupCzcz0eDIiSECovfLcQnLUJt9vhiEU08g== +vite@2.7.8: + version "2.7.8" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.7.8.tgz#0bfd4b513f8dfc8edcf2ea2d2490655dd44f404a" + integrity sha512-NOgvRtXUq4/7srE2cTQ2IU1oERdGq2njVOlZtgRrjMO+PPJpncd61/AUzxzZklQ1zBkiWXEVrw3Csq0Sbgr0rQ== dependencies: esbuild "^0.13.12" postcss "^8.4.5" @@ -2346,6 +2348,11 @@ windicss@^3.4.0: resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.4.0.tgz#2da63739089b5c6f6ca1b7cc28bd855cd5bc95cc" integrity sha512-X+9Y1/FPxX253Xo4Hk/qfVuvoAxgKx686Z6yHxmBFMH7wRCPdRO42na9k/yEnrW6EqCFJP/GcMIHn3QENaE42g== +windicss@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.4.1.tgz#3337a228a99853d232d07f6f9725d263c29dd5ee" + integrity sha512-g6mX0q8divtPT+TSWqvI35lc77pOhGwMrwCdcX48dFA16wUlSDn1kOv5z1msZy3SlWLx3Bjbe7FA6uNTvdVH8A== + wmf@~1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da" -- Gitee From fde0d0532470b86c3f01b49c867f200474d6ca12 Mon Sep 17 00:00:00 2001 From: Blues Young <15171255945@163.com> Date: Thu, 30 Dec 2021 18:51:37 +0800 Subject: [PATCH 02/24] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/color.ts | 122 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 src/util/color.ts diff --git a/src/util/color.ts b/src/util/color.ts new file mode 100644 index 0000000..d2241e9 --- /dev/null +++ b/src/util/color.ts @@ -0,0 +1,122 @@ +/* + * @Author: zhangyang + * @Date: 2021-12-29 17:42:17 + * @LastEditTime: 2021-12-29 18:45:43 + * @Description: 颜色相关的工具函数 + */ + +/** + * 随机 16 进制颜色 + */ +export const randomHexColorCode = () => { + const n = (Math.random() * 0xfffff * 1000000).toString(16); + return '#' + n.slice(0, 6); +}; + +/** + * RGB 转 16进制 + */ +export const RGBToHex = (r: number, g: number, b: number) => ((r << 16) + (g << 8) + b).toString(16).padStart(6, '0'); + +/** + * 16进制 转 RGB + */ +export const hexToRGB = (hex: string) => { + let alpha = false; + let h: string | number = hex.slice(hex.startsWith('#') ? 1 : 0); + if (h.length === 3) { + h = [...h].map((x) => x + x).join(''); + } else if (h.length === 8) { + alpha = true; + } + h = parseInt(h, 16); + return `rgb${alpha ? 'a' : ''}(` + + `${h >>> (alpha ? 24 : 16)}, ` + + `${(h & (alpha ? 0x00ff0000 : 0x00ff00)) >>> (alpha ? 16 : 8)}, ` + + `${(h & (alpha ? 0x0000ff00 : 0x0000ff)) >>> (alpha ? 8 : 0)}` + + `${alpha ? `, ${h & 0x000000ff}` : ''}` + + `)`; +}; + +/** + * 3 位 扩充为 6位 + */ +export const extendHex = (shortHex: string) => '#' + shortHex.slice(shortHex.length === 4 ? 1 : 0).split('').map((x) => x + x).join(''); + +/** + * RGB 转 对象 + */ +export const toRGBObject = (rgbStr: string) => { + const [red, green, blue] = rgbStr.match(/\d+/g)?.map((n) => +n) ?? [0, 0, 0]; + return { red, green, blue }; +}; + +/** + * RGB 转 数组 + */ +export const toRGBArray = (rgbStr: string) => rgbStr.match(/\d+/g)?.map((n) => +n) ?? [0, 0, 0]; + +/** + * RGB 转 HSB + */ +export const RGBToHSB = (r: number, g: number, b: number) => { + r /= 255; + g /= 255; + b /= 255; + const v = Math.max(r, g, b); + const n = v - Math.min(r, g, b); + const h = n === 0 + ? 0 + : n && v === r + ? (g - b) / n + : v === g + ? 2 + (b - r) / n + : 4 + (r - g) / n; + return [60 * (h < 0 ? h + 6 : h), v && (n / v) * 100, v * 100]; +}; + +/** + * HSB 转 RGB + */ +export const HSBToRGB = (h: number, s: number, b: number) => { + s /= 100; + b /= 100; + const k = (n: number) => (n + h / 60) % 6; + const f = (n: number) => b * (1 - s * Math.max(0, Math.min(k(n), 4 - k(n), 1))); + return [255 * f(5), 255 * f(3), 255 * f(1)]; +}; + +/** + * RGB 转 HSL + */ +export const RGBToHSL = (r: number, g: number, b: number) => { + r /= 255; + g /= 255; + b /= 255; + const l = Math.max(r, g, b); + const s = l - Math.min(r, g, b); + const h = s + ? l === r + ? (g - b) / s + : l === g + ? 2 + (b - r) / s + : 4 + (r - g) / s + : 0; + return [ + 60 * h < 0 ? 60 * h + 360 : 60 * h, + 100 * (s ? (l <= 0.5 ? s / (2 * l - s) : s / (2 - (2 * l - s))) : 0), + (100 * (2 * l - s)) / 2, + ]; +}; + +/** + * HLS 转 RGB + */ +export const HSLToRGB = (h: number, s: number, l: number) => { + s /= 100; + l /= 100; + const k = (n: number) => (n + h / 30) % 12; + const a = s * Math.min(l, 1 - l); + const f = (n: number) => l - a * Math.max(-1, Math.min(k(n) - 3, Math.min(9 - k(n), 1))); + return [255 * f(0), 255 * f(8), 255 * f(4)]; +}; -- Gitee From 5d1b6f7706835990b5d3f0776940f9f1e21d1c8b Mon Sep 17 00:00:00 2001 From: BluesYoung-web <15171255945@163.com> Date: Fri, 31 Dec 2021 17:09:57 +0800 Subject: [PATCH 03/24] =?UTF-8?q?chore:=20:hammer:=20=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 +++--- yarn.lock | 105 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 406a4e7..f590701 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "dependencies": { "@element-plus/icons": "^0.0.11", "@tweenjs/tween.js": "^18.6.4", - "@vueuse/core": "^7.4.1", + "@vueuse/core": "^7.5.1", "axios": "^0.24.0", "core-js": "^3.20.1", "element-plus": "^1.2.0-beta.6", @@ -40,7 +40,7 @@ "xlsx": "^0.17.4" }, "devDependencies": { - "@iconify/json": "^1.1.448", + "@iconify/json": "^1.1.450", "@types/file-saver": "^2.0.4", "@types/js-cookie": "^3.0.1", "@types/md5": "^2.3.1", @@ -51,22 +51,22 @@ "@vitejs/plugin-vue": "^2.0.1", "@vitejs/plugin-vue-jsx": "^1.3.3", "@vue/compiler-sfc": "^3.2.26", - "autoprefixer": "^10.4.0", + "autoprefixer": "^10.4.1", "commander": "^8.3.0", "cross-env": "^7.0.3", "inquirer": "^8.2.0", "mockjs": "^1.1.0", - "sass": "^1.45.1", + "sass": "^1.45.2", "shelljs": "^0.8.4", "typescript": "^4.5.4", "unplugin-auto-import": "^0.5.5", "unplugin-icons": "^0.13.0", "unplugin-vue-components": "^0.17.11", - "vite": "2.7.8", + "vite": "2.7.10", "vite-plugin-optimize-persist": "^0.1.2", "vite-plugin-package-config": "^0.1.1", "vite-plugin-windicss": "^1.6.1", - "windicss": "^3.4.1" + "windicss": "^3.4.2" }, "keywords": [ "vue3", diff --git a/yarn.lock b/yarn.lock index 6f86afb..78070fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -447,10 +447,10 @@ resolved "https://registry.yarnpkg.com/@element-plus/icons/-/icons-0.0.11.tgz#9b187c002774548b911850d17fa5fc2f9a515f57" integrity sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A== -"@iconify/json@^1.1.448": - version "1.1.448" - resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.448.tgz#e23f5987f68c86b9a220f50da398adea8a687449" - integrity sha512-DzgNtx6THsRjIRzy8F68gJEfRxBTnfGoCvSmBdNtV/OF/sTEBDMl0q0WPnVbhQb/dalJGGBnscltao6BkMdUAQ== +"@iconify/json@^1.1.450": + version "1.1.450" + resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.450.tgz#e5d00fa34073352e3efae7b04f31f35956eac474" + integrity sha512-U8j5E+bqipaXQi2MDma7ayDjOmrK4/1lzvo0FG0z/qpU5oipp/8XRXL6z8K0GR7kQXpv/xR+WOKDhDW4Cb755w== "@iconify/types@^1.0.12": version "1.0.12" @@ -704,12 +704,12 @@ "@vueuse/shared" "7.3.0" vue-demi "*" -"@vueuse/core@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-7.4.1.tgz#81ede3f67dfd58af8284c910ac2fee25458892c6" - integrity sha512-8UeLPCAieeQLXFHF1/28SIEK6ILLPb/4hp03hR+xkXF00gB/YUp0CEVcRAL9uQ8HTZa3S2T/jTISMc1ZjilM0A== +"@vueuse/core@^7.5.1": + version "7.5.1" + resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-7.5.1.tgz#3038a0ca6e16f6885d2457778260712180422526" + integrity sha512-GczfdTWqH483zkUHdDYiLm0Tn51OtsQXYc+eBKKIeolh0mgn682KbSYmkrjNytaF7qGc74YxMDAYjkPBW6V2Pg== dependencies: - "@vueuse/shared" "7.4.1" + "@vueuse/shared" "7.5.1" vue-demi "*" "@vueuse/shared@7.3.0": @@ -719,10 +719,10 @@ dependencies: vue-demi "*" -"@vueuse/shared@7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-7.4.1.tgz#0aa090147fbd66ba56334ada1ffa2dafab815c1b" - integrity sha512-Pzb7XoHIcgPwwBJ5Ow9lZb0HTDyaLDV3pgxKauPGTMN9qvEylG06kUG+VTjJXkPsRtiGu46di8XyFeMw2dongA== +"@vueuse/shared@7.5.1": + version "7.5.1" + resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-7.5.1.tgz#d88a8d8a4799c30e7dd4f965808e78b3793c3da6" + integrity sha512-zMQEuYJyTmr5Hj2rYgSbb4H/cSI8mdaa9dUuw20j6rPV+xLV11y7vCyIkxo31uODDr0p77FMlProKzNDiK9rAA== dependencies: vue-demi "*" @@ -803,17 +803,17 @@ async-validator@^4.0.7: resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.0.7.tgz#034a0fd2103a6b2ebf010da75183bec299247afe" integrity sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ== -autoprefixer@^10.4.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" - integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== +autoprefixer@^10.4.1: + version "10.4.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.1.tgz#1735959d6462420569bc42408016acbc56861c12" + integrity sha512-B3ZEG7wtzXDRCEFsan7HmR2AeNsxdJB0+sEC0Hc5/c2NbhJqPwuZm+tn233GBVw82L+6CtD6IPSfVruwKjfV3A== dependencies: - browserslist "^4.17.5" - caniuse-lite "^1.0.30001272" - fraction.js "^4.1.1" + browserslist "^4.19.1" + caniuse-lite "^1.0.30001294" + fraction.js "^4.1.2" normalize-range "^0.1.2" picocolors "^1.0.0" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" axios@^0.24.0: version "0.24.0" @@ -872,6 +872,17 @@ browserslist@^4.17.5: node-releases "^2.0.1" picocolors "^1.0.0" +browserslist@^4.19.1: + version "4.19.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" + integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== + dependencies: + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" + escalade "^3.1.1" + node-releases "^2.0.1" + picocolors "^1.0.0" + buffer@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz" @@ -892,11 +903,16 @@ camelcase@^6.0.0: resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-6.2.0.tgz" integrity sha1-kkr4gcnVJaydh/QNlk5c6pgqGAk= -caniuse-lite@^1.0.30001271, caniuse-lite@^1.0.30001272: +caniuse-lite@^1.0.30001271: version "1.0.30001272" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz" integrity sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw== +caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001294: + version "1.0.30001294" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz#4849f27b101fd59ddee3751598c663801032533d" + integrity sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g== + cfb@^1.1.4: version "1.2.0" resolved "https://registry.npmjs.org/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8" @@ -1136,6 +1152,11 @@ electron-to-chromium@^1.3.878: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.885.tgz#c8cec32fbc61364127849ae00f2395a1bae7c454" integrity sha512-JXKFJcVWrdHa09n4CNZYfYaK6EW5aAew7/wr3L1OnsD1L+JHL+RCtd7QgIsxUbFPeTwPlvnpqNNTOLkoefmtXg== +electron-to-chromium@^1.4.17: + version "1.4.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz#0f75a1dce26dffbd5a0f7212e5b87fe0b61cbc76" + integrity sha512-609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ== + element-plus@^1.2.0-beta.6: version "1.2.0-beta.6" resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-1.2.0-beta.6.tgz#9fa01a06950eb0380f0454cb75aefaaf5b81b043" @@ -1362,10 +1383,10 @@ frac@~1.1.2: resolved "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b" integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA== -fraction.js@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz" - integrity sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg== +fraction.js@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" + integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== fs-extra@^10.0.0: version "10.0.0" @@ -1887,10 +1908,10 @@ picomatch@^2.2.2, picomatch@^2.2.3: resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== -postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz" - integrity sha1-RD9qIM7WSBor2k+oUypuVdeJoss= +postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.1.10: version "8.3.0" @@ -2022,10 +2043,10 @@ safe-buffer@~5.2.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass@^1.45.1: - version "1.45.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.1.tgz#fa03951f924d1ba5762949567eaf660e608a1ab0" - integrity sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA== +sass@^1.45.2: + version "1.45.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.2.tgz#130b428c1692201cfa181139835d6fc378a33323" + integrity sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -2280,10 +2301,10 @@ vite-plugin-windicss@^1.6.1: kolorist "^1.5.1" windicss "^3.4.0" -vite@2.7.8: - version "2.7.8" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.7.8.tgz#0bfd4b513f8dfc8edcf2ea2d2490655dd44f404a" - integrity sha512-NOgvRtXUq4/7srE2cTQ2IU1oERdGq2njVOlZtgRrjMO+PPJpncd61/AUzxzZklQ1zBkiWXEVrw3Csq0Sbgr0rQ== +vite@2.7.10: + version "2.7.10" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.7.10.tgz#d12c4c10e56a0ecf7890cb529c15996c6111218f" + integrity sha512-KEY96ntXUid1/xJihJbgmLZx7QSC2D4Tui0FdS0Old5OokYzFclcofhtxtjDdGOk/fFpPbHv9yw88+rB93Tb8w== dependencies: esbuild "^0.13.12" postcss "^8.4.5" @@ -2348,10 +2369,10 @@ windicss@^3.4.0: resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.4.0.tgz#2da63739089b5c6f6ca1b7cc28bd855cd5bc95cc" integrity sha512-X+9Y1/FPxX253Xo4Hk/qfVuvoAxgKx686Z6yHxmBFMH7wRCPdRO42na9k/yEnrW6EqCFJP/GcMIHn3QENaE42g== -windicss@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.4.1.tgz#3337a228a99853d232d07f6f9725d263c29dd5ee" - integrity sha512-g6mX0q8divtPT+TSWqvI35lc77pOhGwMrwCdcX48dFA16wUlSDn1kOv5z1msZy3SlWLx3Bjbe7FA6uNTvdVH8A== +windicss@^3.4.2: + version "3.4.2" + resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.4.2.tgz#257795c9be8b6e93117ffa3fb27874d225da6679" + integrity sha512-YieqWaXiwPu0JJoB7z03RXdjZjQQJtMZAeXUXu/j3JXSMhIgV/2rUXu4Q7QrworRlbaASZlFhxjnL/78aAty+Q== wmf@~1.0.1: version "1.0.2" -- Gitee From c0eb9cf874a6003251f1b2e86a7409287118e2bf Mon Sep 17 00:00:00 2001 From: BluesYoung-web <15171255945@163.com> Date: Sat, 1 Jan 2022 15:07:32 +0800 Subject: [PATCH 04/24] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?Element=20Plus=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 37 ++++++++++++++----------------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index f590701..26caccf 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@vueuse/core": "^7.5.1", "axios": "^0.24.0", "core-js": "^3.20.1", - "element-plus": "^1.2.0-beta.6", + "element-plus": "^1.3.0-beta.1", "file-saver": "^2.0.5", "highlight.js": "^11.3.1", "js-cookie": "^3.0.1", diff --git a/yarn.lock b/yarn.lock index 78070fc..f5e9910 100644 --- a/yarn.lock +++ b/yarn.lock @@ -437,7 +437,12 @@ "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" -"@element-plus/icons-vue@^0.2.2": +"@ctrl/tinycolor@^3.4.0": + version "3.4.0" + resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f" + integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ== + +"@element-plus/icons-vue@^0.2.4": version "0.2.4" resolved "https://registry.yarnpkg.com/@element-plus/icons-vue/-/icons-vue-0.2.4.tgz#dadcf72f0cea53dc83b7b7db80e1418716d7b02c" integrity sha512-RsJNyL58rwxtsjeMy34o8txkL6UlME1stWsUlRpTac6UE9Bx9gdJvnDXbIKhOJqBLX17fBjmposdrn6VTqim2w== @@ -696,15 +701,7 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.26.tgz#7acd1621783571b9a82eca1f041b4a0a983481d9" integrity sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA== -"@vueuse/core@^7.0.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-7.3.0.tgz#fe24ff698069cb7dcc835a8fe2eeb29b22b2a702" - integrity sha512-gPJyMMAquva9Qwqz63qGQT122m5hWI8Kuy8kfPV/JLQU7m01CXooyv8FIrX9TV8OxVcHBTPXPJHY0oyUiFoNgw== - dependencies: - "@vueuse/shared" "7.3.0" - vue-demi "*" - -"@vueuse/core@^7.5.1": +"@vueuse/core@^7.3.0", "@vueuse/core@^7.5.1": version "7.5.1" resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-7.5.1.tgz#3038a0ca6e16f6885d2457778260712180422526" integrity sha512-GczfdTWqH483zkUHdDYiLm0Tn51OtsQXYc+eBKKIeolh0mgn682KbSYmkrjNytaF7qGc74YxMDAYjkPBW6V2Pg== @@ -712,13 +709,6 @@ "@vueuse/shared" "7.5.1" vue-demi "*" -"@vueuse/shared@7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-7.3.0.tgz#729b2f0a83f38647896d955902e828dcbd8ed7dc" - integrity sha512-vOAeI84tIXKVkzm8s/Mxbrzhj0QN6NyVc/sC6LrW0AjVNdvpD8sB1dZiDn9yh8T77WJmloCEt4zZVIppeq7I+w== - dependencies: - vue-demi "*" - "@vueuse/shared@7.5.1": version "7.5.1" resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-7.5.1.tgz#d88a8d8a4799c30e7dd4f965808e78b3793c3da6" @@ -1157,14 +1147,15 @@ electron-to-chromium@^1.4.17: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz#0f75a1dce26dffbd5a0f7212e5b87fe0b61cbc76" integrity sha512-609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ== -element-plus@^1.2.0-beta.6: - version "1.2.0-beta.6" - resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-1.2.0-beta.6.tgz#9fa01a06950eb0380f0454cb75aefaaf5b81b043" - integrity sha512-8EdSIR/5/FHcSB8w1diAh+gJMHgxIvxuZoayY99k6taAR1QyEFHuPTgFccZLopJ1+iP4UEsZFz49l57qS08Utw== +element-plus@^1.3.0-beta.1: + version "1.3.0-beta.1" + resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-1.3.0-beta.1.tgz#4df67fcedb0c13d14c9f54eea7b739109f5df49f" + integrity sha512-q3vMaKElPpuSTeIF7kuDmMOE+N1YVCCIG3fshXpz6qgjnxPbgZumVM0qGfhr8DTu9JxRbBoDok49dqtX/BWn3w== dependencies: - "@element-plus/icons-vue" "^0.2.2" + "@ctrl/tinycolor" "^3.4.0" + "@element-plus/icons-vue" "^0.2.4" "@popperjs/core" "^2.10.2" - "@vueuse/core" "^7.0.0" + "@vueuse/core" "^7.3.0" async-validator "^4.0.7" dayjs "^1.10.7" lodash "^4.17.21" -- Gitee From 30c978217a1240d270489ce7465444fe643566bb Mon Sep 17 00:00:00 2001 From: BluesYoung-web <15171255945@163.com> Date: Sat, 1 Jan 2022 15:08:03 +0800 Subject: [PATCH 05/24] =?UTF-8?q?fix:=20:bug:=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 ++-- src/components/YoungDialog/index.vue | 6 +++--- src/components/YoungTable/index.vue | 3 +-- src/layout/NavBar/index.vue | 10 +++++----- src/main.ts | 4 +--- src/views/login/index.vue | 6 +++--- src/views/system/node.vue | 5 ++--- src/views/system/role.vue | 6 ++---- src/views/vueUse/useClipboard.vue | 4 ++-- 9 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/App.vue b/src/App.vue index fc4e287..d527dd6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,11 @@ diff --git a/src/components/YoungDialog/index.vue b/src/components/YoungDialog/index.vue index fad322d..49ec48a 100644 --- a/src/components/YoungDialog/index.vue +++ b/src/components/YoungDialog/index.vue @@ -1,7 +1,7 @@