Commit 159d900df3ffcc8691016cb5e75406b00b6460ee
1 parent
8ad127c2
chore: update deps
Showing
4 changed files
with
33 additions
and
35 deletions
package.json
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | "prettier": "^2.2.1", | 100 | "prettier": "^2.2.1", |
101 | "pretty-quick": "^3.1.0", | 101 | "pretty-quick": "^3.1.0", |
102 | "rimraf": "^3.0.2", | 102 | "rimraf": "^3.0.2", |
103 | - "rollup-plugin-visualizer": "4.2.1", | 103 | + "rollup-plugin-visualizer": "4.2.2", |
104 | "stylelint": "^13.12.0", | 104 | "stylelint": "^13.12.0", |
105 | "stylelint-config-prettier": "^8.0.2", | 105 | "stylelint-config-prettier": "^8.0.2", |
106 | "stylelint-config-standard": "^21.0.0", | 106 | "stylelint-config-standard": "^21.0.0", |
@@ -117,7 +117,7 @@ | @@ -117,7 +117,7 @@ | ||
117 | "vite-plugin-style-import": "^0.8.1", | 117 | "vite-plugin-style-import": "^0.8.1", |
118 | "vite-plugin-svg-icons": "^0.4.0", | 118 | "vite-plugin-svg-icons": "^0.4.0", |
119 | "vite-plugin-theme": "^0.5.0", | 119 | "vite-plugin-theme": "^0.5.0", |
120 | - "vite-plugin-windicss": "0.9.6", | 120 | + "vite-plugin-windicss": "0.9.7", |
121 | "vue-eslint-parser": "^7.6.0", | 121 | "vue-eslint-parser": "^7.6.0", |
122 | "yargs": "^16.2.0" | 122 | "yargs": "^16.2.0" |
123 | }, | 123 | }, |
src/layouts/default/tabs/components/TabRedo.vue
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | import { useTabs } from '/@/hooks/web/useTabs'; | 14 | import { useTabs } from '/@/hooks/web/useTabs'; |
15 | 15 | ||
16 | export default defineComponent({ | 16 | export default defineComponent({ |
17 | - name: 'TabContent', | 17 | + name: 'TabRedo', |
18 | components: { RedoOutlined, Tooltip }, | 18 | components: { RedoOutlined, Tooltip }, |
19 | 19 | ||
20 | setup() { | 20 | setup() { |
src/utils/cache/memory.ts
@@ -57,10 +57,14 @@ export class Memory<T = any, V = any> { | @@ -57,10 +57,14 @@ export class Memory<T = any, V = any> { | ||
57 | if (!expires) { | 57 | if (!expires) { |
58 | return value; | 58 | return value; |
59 | } | 59 | } |
60 | - item.time = new Date().getTime() + this.alive; | ||
61 | - item.timeoutId = setTimeout(() => { | ||
62 | - // this.remove(key); | ||
63 | - }, expires); | 60 | + const now = new Date().getTime(); |
61 | + item.time = now + this.alive; | ||
62 | + item.timeoutId = setTimeout( | ||
63 | + () => { | ||
64 | + this.remove(key); | ||
65 | + }, | ||
66 | + expires > now ? expires - now : expires | ||
67 | + ); | ||
64 | 68 | ||
65 | return value; | 69 | return value; |
66 | } | 70 | } |
yarn.lock
@@ -2091,10 +2091,10 @@ | @@ -2091,10 +2091,10 @@ | ||
2091 | dependencies: | 2091 | dependencies: |
2092 | vue-demi latest | 2092 | vue-demi latest |
2093 | 2093 | ||
2094 | -"@windicss/plugin-utils@0.9.6": | ||
2095 | - version "0.9.6" | ||
2096 | - resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.9.6.tgz#89e4709bc48c9eb03c2484054f519560791ccafa" | ||
2097 | - integrity sha512-rpuRPjndF5GR2BZFaISGAwe6DHii16Cfs0/003El6vBxQbWpL75BslfNYeJKAhnRfkqfPxcq4lybxHGWmvsaug== | 2094 | +"@windicss/plugin-utils@0.9.7": |
2095 | + version "0.9.7" | ||
2096 | + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.9.7.tgz#ffc70d9a0eb130a3fc691291becdcdab6ae55b36" | ||
2097 | + integrity sha512-tyKcMTXENd7AYV1Z3DbZUq/x8/UM3bGeg327lHKrsklds6F4MKZRVwtG2ya5h5taeKmcLHK+qvIvknwhwKNxrA== | ||
2098 | dependencies: | 2098 | dependencies: |
2099 | debug "^4.3.2" | 2099 | debug "^4.3.2" |
2100 | fast-glob "^3.2.5" | 2100 | fast-glob "^3.2.5" |
@@ -3968,11 +3968,6 @@ defaults@^1.0.3: | @@ -3968,11 +3968,6 @@ defaults@^1.0.3: | ||
3968 | dependencies: | 3968 | dependencies: |
3969 | clone "^1.0.2" | 3969 | clone "^1.0.2" |
3970 | 3970 | ||
3971 | -define-lazy-prop@^2.0.0: | ||
3972 | - version "2.0.0" | ||
3973 | - resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" | ||
3974 | - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== | ||
3975 | - | ||
3976 | define-properties@^1.1.3: | 3971 | define-properties@^1.1.3: |
3977 | version "1.1.3" | 3972 | version "1.1.3" |
3978 | resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" | 3973 | resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" |
@@ -6228,7 +6223,7 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: | @@ -6228,7 +6223,7 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: | ||
6228 | is-data-descriptor "^1.0.0" | 6223 | is-data-descriptor "^1.0.0" |
6229 | kind-of "^6.0.2" | 6224 | kind-of "^6.0.2" |
6230 | 6225 | ||
6231 | -is-docker@^2.0.0, is-docker@^2.1.1: | 6226 | +is-docker@^2.0.0: |
6232 | version "2.1.1" | 6227 | version "2.1.1" |
6233 | resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" | 6228 | resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" |
6234 | integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== | 6229 | integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== |
@@ -6477,7 +6472,7 @@ is-windows@^1.0.1, is-windows@^1.0.2: | @@ -6477,7 +6472,7 @@ is-windows@^1.0.1, is-windows@^1.0.2: | ||
6477 | resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" | 6472 | resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" |
6478 | integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== | 6473 | integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== |
6479 | 6474 | ||
6480 | -is-wsl@^2.2.0: | 6475 | +is-wsl@^2.1.1, is-wsl@^2.2.0: |
6481 | version "2.2.0" | 6476 | version "2.2.0" |
6482 | resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" | 6477 | resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" |
6483 | integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== | 6478 | integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== |
@@ -8184,14 +8179,13 @@ onetime@^5.1.0, onetime@^5.1.2: | @@ -8184,14 +8179,13 @@ onetime@^5.1.0, onetime@^5.1.2: | ||
8184 | dependencies: | 8179 | dependencies: |
8185 | mimic-fn "^2.1.0" | 8180 | mimic-fn "^2.1.0" |
8186 | 8181 | ||
8187 | -open@^8.0.0: | ||
8188 | - version "8.0.3" | ||
8189 | - resolved "https://registry.npmjs.org/open/-/open-8.0.3.tgz#04f4406c950666c35041aad8a621700022116afd" | ||
8190 | - integrity sha512-7nsHNw3rOIPTwhF5iYkgE+LVM/oUHWC3cgrWNxPqa+W+Wl5Ekvo32qayB5PYX8zNjXzUkrTaJsWpaGmuw8Aspg== | 8182 | +open@^7.4.2: |
8183 | + version "7.4.2" | ||
8184 | + resolved "https://registry.npmjs.org/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" | ||
8185 | + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== | ||
8191 | dependencies: | 8186 | dependencies: |
8192 | - define-lazy-prop "^2.0.0" | ||
8193 | - is-docker "^2.1.1" | ||
8194 | - is-wsl "^2.2.0" | 8187 | + is-docker "^2.0.0" |
8188 | + is-wsl "^2.1.1" | ||
8195 | 8189 | ||
8196 | opener@^1.5.1: | 8190 | opener@^1.5.1: |
8197 | version "1.5.2" | 8191 | version "1.5.2" |
@@ -9529,13 +9523,13 @@ rollup-plugin-terser@^7.0.0: | @@ -9529,13 +9523,13 @@ rollup-plugin-terser@^7.0.0: | ||
9529 | serialize-javascript "^4.0.0" | 9523 | serialize-javascript "^4.0.0" |
9530 | terser "^5.0.0" | 9524 | terser "^5.0.0" |
9531 | 9525 | ||
9532 | -rollup-plugin-visualizer@4.2.1: | ||
9533 | - version "4.2.1" | ||
9534 | - resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.2.1.tgz#16ec56d1062c2a1f4005a0c4c7a1c49de7bd070a" | ||
9535 | - integrity sha512-GKXszY24T+WtSHVJclNcOpRaAU87E7bB6FZSdr71zcrnXY96QGgI8iyyGWOSfEH94qW4OQ+x5PcIB3zqWypYVQ== | 9526 | +rollup-plugin-visualizer@4.2.2: |
9527 | + version "4.2.2" | ||
9528 | + resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.2.2.tgz#edeb8b3fc6f49b3c95f6cc668f4eba57c6112099" | ||
9529 | + integrity sha512-10/TsugsaQL5rdynl0lrklBngTtkRBESZdxUJy+3fN+xKqNdg5cr7JQU1OoPx4p5mhQ+nspa6EvX3qc8SsBvnA== | ||
9536 | dependencies: | 9530 | dependencies: |
9537 | nanoid "^3.1.22" | 9531 | nanoid "^3.1.22" |
9538 | - open "^8.0.0" | 9532 | + open "^7.4.2" |
9539 | source-map "^0.7.3" | 9533 | source-map "^0.7.3" |
9540 | yargs "^16.2.0" | 9534 | yargs "^16.2.0" |
9541 | 9535 | ||
@@ -11354,12 +11348,12 @@ vite-plugin-theme@^0.5.0: | @@ -11354,12 +11348,12 @@ vite-plugin-theme@^0.5.0: | ||
11354 | tinycolor2 "^1.4.2" | 11348 | tinycolor2 "^1.4.2" |
11355 | ts-jest "^26.5.3" | 11349 | ts-jest "^26.5.3" |
11356 | 11350 | ||
11357 | -vite-plugin-windicss@0.9.6: | ||
11358 | - version "0.9.6" | ||
11359 | - resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.9.6.tgz#8c1b55e365ef311296e0db427ed358b5b46247b1" | ||
11360 | - integrity sha512-vNyPTuVyCV34slkbzaARvMOCC93ueuP0bw0ETyoUduCwIjP2NwI9C88b3LneVM46TAEDIzHtlTJjkq+APADVOA== | 11351 | +vite-plugin-windicss@0.9.7: |
11352 | + version "0.9.7" | ||
11353 | + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.9.7.tgz#27840f480c786f920f0130b3058604c97c2d8a69" | ||
11354 | + integrity sha512-chk7vlV2VyofE5FlxEIhsHajPDInnW44QljY+vHvnd/r90pBEJF6dS9+fpJoS5+jrCVWTCX6t1BL4rZOkIv69A== | ||
11361 | dependencies: | 11355 | dependencies: |
11362 | - "@windicss/plugin-utils" "0.9.6" | 11356 | + "@windicss/plugin-utils" "0.9.7" |
11363 | debug "^4.3.2" | 11357 | debug "^4.3.2" |
11364 | windicss "^2.5.4" | 11358 | windicss "^2.5.4" |
11365 | 11359 |