Commit 963ff024 authored by chenqikuai's avatar chenqikuai

fix

parent 4c60a4be
...@@ -339,16 +339,16 @@ ...@@ -339,16 +339,16 @@
} }
}, },
"@vue/compiler-sfc": { "@vue/compiler-sfc": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
"integrity": "sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==", "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.33", "@vue/compiler-core": "3.2.37",
"@vue/compiler-dom": "3.2.33", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-ssr": "3.2.33", "@vue/compiler-ssr": "3.2.37",
"@vue/reactivity-transform": "3.2.33", "@vue/reactivity-transform": "3.2.37",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"postcss": "^8.1.10", "postcss": "^8.1.10",
...@@ -356,29 +356,29 @@ ...@@ -356,29 +356,29 @@
}, },
"dependencies": { "dependencies": {
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/compiler-dom": { "@vue/compiler-dom": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==", "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.33", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}, },
"magic-string": { "magic-string": {
"version": "0.25.9", "version": "0.25.9",
...@@ -391,38 +391,38 @@ ...@@ -391,38 +391,38 @@
} }
}, },
"@vue/compiler-ssr": { "@vue/compiler-ssr": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
"integrity": "sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==", "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.33", "@vue/compiler-dom": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
}, },
"dependencies": { "dependencies": {
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/compiler-dom": { "@vue/compiler-dom": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==", "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.33", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
} }
} }
}, },
...@@ -441,32 +441,32 @@ ...@@ -441,32 +441,32 @@
} }
}, },
"@vue/reactivity-transform": { "@vue/reactivity-transform": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
"integrity": "sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==", "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.33", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
}, },
"dependencies": { "dependencies": {
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}, },
"magic-string": { "magic-string": {
"version": "0.25.9", "version": "0.25.9",
...@@ -479,59 +479,59 @@ ...@@ -479,59 +479,59 @@
} }
}, },
"@vue/runtime-core": { "@vue/runtime-core": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
"integrity": "sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==", "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
"requires": { "requires": {
"@vue/reactivity": "3.2.33", "@vue/reactivity": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
}, },
"dependencies": { "dependencies": {
"@vue/reactivity": { "@vue/reactivity": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
"integrity": "sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==", "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
"requires": { "requires": {
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
} }
} }
}, },
"@vue/runtime-dom": { "@vue/runtime-dom": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
"integrity": "sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==", "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
"requires": { "requires": {
"@vue/runtime-core": "3.2.33", "@vue/runtime-core": "3.2.37",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"csstype": "^2.6.8" "csstype": "^2.6.8"
}, },
"dependencies": { "dependencies": {
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
} }
} }
}, },
"@vue/server-renderer": { "@vue/server-renderer": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
"integrity": "sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==", "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
"requires": { "requires": {
"@vue/compiler-ssr": "3.2.33", "@vue/compiler-ssr": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
}, },
"dependencies": { "dependencies": {
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
} }
} }
}, },
...@@ -2372,41 +2372,41 @@ ...@@ -2372,41 +2372,41 @@
} }
}, },
"vue": { "vue": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.33.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
"integrity": "sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==", "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.33", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-sfc": "3.2.33", "@vue/compiler-sfc": "3.2.37",
"@vue/runtime-dom": "3.2.33", "@vue/runtime-dom": "3.2.37",
"@vue/server-renderer": "3.2.33", "@vue/server-renderer": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
}, },
"dependencies": { "dependencies": {
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.33", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/compiler-dom": { "@vue/compiler-dom": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==", "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.33", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.33" "@vue/shared": "3.2.37"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.33", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
} }
} }
}, },
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"pdfjs-dist": "^2.5.207", "pdfjs-dist": "^2.5.207",
"simple-components01": "^0.1.15", "simple-components01": "^0.1.15",
"unplugin-element-plus": "^0.3.2", "unplugin-element-plus": "^0.3.2",
"vue": "^3.2.33", "vue": "^3.2.37",
"vue-cropper": "^1.0.2", "vue-cropper": "^1.0.2",
"vue-router": "^4.0.13" "vue-router": "^4.0.13"
}, },
......
...@@ -20,7 +20,7 @@ onMounted(async () => { ...@@ -20,7 +20,7 @@ onMounted(async () => {
<template> <template>
<ElConfigProvider :locale="zhCn"> <ElConfigProvider :locale="zhCn">
<router-view></router-view> <router-view :key="$route.name"></router-view>
<globalMount /> <globalMount />
</ElConfigProvider> </ElConfigProvider>
</template> </template>
...@@ -86,19 +86,23 @@ watch(finalHover, () => { ...@@ -86,19 +86,23 @@ watch(finalHover, () => {
top.value = rect?.top!; top.value = rect?.top!;
if (!box.value) return; if (!box.value) return;
emit("over"); emit("over");
box.value.style.transition = "none"; if (box.value) {
box.value.style.transition = t; box.value.style.transition = "none";
box.value.style.display = "block"; box.value.style.transition = t;
box.value.style.opacity = "0"; box.value.style.display = "block";
setTimeout(() => { box.value.style.opacity = "0";
box.value!.style.opacity = "1"; setTimeout(() => {
}); box.value!.style.opacity = "1";
});
}
} else { } else {
if (!box.value) return; if (!box.value) return;
emit("out"); emit("out");
box.value.style.opacity = "0"; if (box.value) {
box.value.style.opacity = "0";
}
box.value.ontransitionend = () => { box.value.ontransitionend = () => {
if (box.value!.style.opacity === "0") box.value!.style.display = "none"; if (box.value?.style.opacity === "0") box.value!.style.display = "none";
}; };
} }
}); });
......
...@@ -11,29 +11,29 @@ ...@@ -11,29 +11,29 @@
/> />
</div> </div>
<div <div
v-for="(obj, index) in menuList" v-for="(menu, index) in menuList"
:key="index" :key="index"
style="width: 100%; display: flex; justify-content: center" style="width: 100%; display: flex; justify-content: center"
> >
<MenuItem <MenuItem
v-if="obj.type === 'menuItem'" v-if="menu.type === 'menuItem'"
:name="obj.name!" :name="menu.name!"
@click="handleClickMenu(obj)" @click="handleClickMenu(menu)"
:active="isMenuActive(obj)" :active="isMenuActive(menu)"
> >
<template #icon> <template #icon>
<Icon <Icon
:icon-name="isMenuActive(obj) ? obj.icon?.active.iconName! : obj.icon?.notActive.iconName!" :icon-name="isMenuActive(menu) ? menu.icon?.active.iconName! : menu.icon?.notActive.iconName!"
v-bind="isMenuActive(obj) ? obj.icon?.active.props! : obj.icon?.notActive.props!" v-bind="isMenuActive(menu) ? menu.icon?.active.props! : menu.icon?.notActive.props!"
></Icon> ></Icon>
</template> </template>
</MenuItem> </MenuItem>
<div <div
class="menuDivideLine" class="menuDivideLine"
v-else-if="obj.type === 'menuDivideLine'" v-else-if="menu.type === 'menuDivideLine'"
></div> ></div>
<div class="menuGroupName" v-else-if="obj.type === 'menuGroupName'"> <div class="menuGroupName" v-else-if="menu.type === 'menuGroupName'">
{{ obj.name }} {{ menu.name }}
</div> </div>
</div> </div>
<ChainBrowser <ChainBrowser
...@@ -52,7 +52,7 @@ import { globalState } from "@/store/state"; ...@@ -52,7 +52,7 @@ import { globalState } from "@/store/state";
const route = useRoute(); const route = useRoute();
const isMenuActive = (obj: typeof menuList[0]) => { const isMenuActive = (obj: any) => {
return ( return (
obj.path === route.path || obj.path === route.path ||
obj.otherActivePath?.includes(route.path) || obj.otherActivePath?.includes(route.path) ||
...@@ -110,6 +110,7 @@ const menuList = [ ...@@ -110,6 +110,7 @@ const menuList = [
type: "menuItem", type: "menuItem",
name: "模板管理", name: "模板管理",
path: "/templateManagement", path: "/templateManagement",
otherActivePath: [],
icon: { icon: {
active: { iconName: "iconmoban2", props: {} }, active: { iconName: "iconmoban2", props: {} },
notActive: { iconName: "iconmoban1", props: {} }, notActive: { iconName: "iconmoban1", props: {} },
...@@ -122,6 +123,7 @@ const menuList = [ ...@@ -122,6 +123,7 @@ const menuList = [
type: "menuItem", type: "menuItem",
name: "回收站", name: "回收站",
path: "/recycleBin", path: "/recycleBin",
otherActivePath: [],
icon: { icon: {
active: { iconName: "iconhuishouzhan2", props: {} }, active: { iconName: "iconhuishouzhan2", props: {} },
notActive: { iconName: "iconhuishouzhan1", props: {} }, notActive: { iconName: "iconhuishouzhan1", props: {} },
......
...@@ -37,8 +37,7 @@ export default defineConfig({ ...@@ -37,8 +37,7 @@ export default defineConfig({
rollupOptions: { rollupOptions: {
output: { output: {
manualChunks: { manualChunks: {
// __SignIn: ["./src/views/SignIn.vue"], __SignIn: ["./src/views/SignIn.vue"],
// __category: ["./src/views/category/Index.vue"],
__recycleBin: ["./src/views/category/recycleBin.vue"], __recycleBin: ["./src/views/category/recycleBin.vue"],
__templateManagement: ["./src/views/category/templateManagement.vue"], __templateManagement: ["./src/views/category/templateManagement.vue"],
__tracingManagement: ["./src/views/category/tracingManagement.vue"], __tracingManagement: ["./src/views/category/tracingManagement.vue"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment