chore: 依赖更新

2024-09-07 11:01:51 +08:00
parent aa13d8c909
commit 0613e35932
31 changed files with 582 additions and 610 deletions
--- a/packages/@core/base/icons/package.json
+++ b/packages/@core/base/icons/package.json
@@ -36,6 +36,6 @@
  "dependencies": {
    "@iconify/vue": "^4.1.2",
    "lucide-vue-next": "^0.438.0",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/base/shared/package.json
+++ b/packages/@core/base/shared/package.json
@@ -62,7 +62,7 @@
  "dependencies": {
    "@ctrl/tinycolor": "^4.1.0",
    "@tanstack/vue-store": "^0.5.5",
-    "@vue/shared": "^3.5.1",
+    "@vue/shared": "^3.5.2",
    "clsx": "^2.1.1",
    "defu": "^6.1.4",
    "lodash.clonedeep": "^4.5.0",
--- a/packages/@core/base/typings/package.json
+++ b/packages/@core/base/typings/package.json
@@ -38,7 +38,7 @@
    }
  },
  "dependencies": {
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3"
  }
 }
--- a/packages/@core/composables/package.json
+++ b/packages/@core/composables/package.json
@@ -39,7 +39,7 @@
    "@vueuse/core": "^11.0.3",
    "radix-vue": "^1.9.5",
    "sortablejs": "^1.15.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  },
  "devDependencies": {
    "@types/sortablejs": "^1.15.8"
--- a/packages/@core/preferences/package.json
+++ b/packages/@core/preferences/package.json
@@ -32,6 +32,6 @@
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/ui-kit/layout-ui/package.json
+++ b/packages/@core/ui-kit/layout-ui/package.json
@@ -42,6 +42,6 @@
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/ui-kit/menu-ui/package.json
+++ b/packages/@core/ui-kit/menu-ui/package.json
@@ -43,6 +43,6 @@
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/ui-kit/popup-ui/package.json
+++ b/packages/@core/ui-kit/popup-ui/package.json
@@ -42,6 +42,6 @@
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/shared": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/ui-kit/shadcn-ui/package.json
+++ b/packages/@core/ui-kit/shadcn-ui/package.json
@@ -50,6 +50,6 @@
    "class-variance-authority": "^0.7.0",
    "lucide-vue-next": "^0.438.0",
    "radix-vue": "^1.9.5",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/@core/ui-kit/tabs-ui/package.json
+++ b/packages/@core/ui-kit/tabs-ui/package.json
@@ -42,6 +42,6 @@
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/effects/access/package.json
+++ b/packages/effects/access/package.json
@@ -24,6 +24,6 @@
    "@vben/stores": "workspace:*",
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/effects/common-ui/package.json
+++ b/packages/effects/common-ui/package.json
@@ -29,7 +29,7 @@
    "@vben/types": "workspace:*",
    "@vueuse/integrations": "^11.0.3",
    "qrcode": "^1.5.4",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3"
  },
  "devDependencies": {
--- a/packages/effects/hooks/package.json
+++ b/packages/effects/hooks/package.json
@@ -25,8 +25,8 @@
    "@vben/stores": "workspace:*",
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3",
-    "watermark-js-plus": "^1.5.4"
+    "watermark-js-plus": "^1.5.5"
  }
 }
--- a/packages/effects/layouts/package.json
+++ b/packages/effects/layouts/package.json
@@ -24,6 +24,7 @@
    "@vben-core/menu-ui": "workspace:*",
    "@vben-core/popup-ui": "workspace:*",
    "@vben-core/shadcn-ui": "workspace:*",
+    "@vben-core/shared": "workspace:*",
    "@vben-core/tabs-ui": "workspace:*",
    "@vben/constants": "workspace:*",
    "@vben/hooks": "workspace:*",
@@ -34,7 +35,7 @@
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
    "@vueuse/core": "^11.0.3",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3"
  }
 }
--- a/packages/effects/layouts/src/widgets/global-search/search-panel.vue
+++ b/packages/effects/layouts/src/widgets/global-search/search-panel.vue
@@ -8,6 +8,7 @@ import { SearchX, X } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { mapTree, traverseTreeValues, uniqueByField } from '@vben/utils';
 import { VbenIcon, VbenScrollbar } from '@vben-core/shadcn-ui';
+import { isHttpUrl } from '@vben-core/shared';

 import { onKeyStroke, useLocalStorage, useThrottleFn } from '@vueuse/core';

@@ -99,7 +100,11 @@ async function handleEnter() {
    searchHistory.value.push(to);
    handleClose();
    await nextTick();
-    router.push(to.path);
+    if (isHttpUrl(to.path)) {
+      window.open(to.path, '_blank');
+    } else {
+      router.push({ path: to.path, replace: true });
+    }
  }
 }

@@ -157,14 +162,14 @@ const code = new Set([
  '*',
  '+',
  '.',
-  '[',
-  ']',
  '?',
+  '[',
  '\\',
+  ']',
  '^',
  '{',
-  '}',
  '|',
+  '}',
 ]);

 // 转换函数，用于转义特殊字符
--- a/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue
+++ b/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, reactive, ref, watchEffect } from 'vue';
+import { computed, reactive, ref } from 'vue';

 import { LockKeyhole } from '@vben/icons';
 import { $t, useI18n } from '@vben/locales';
@@ -36,7 +36,6 @@ const minute = useDateFormat(now, 'mm');
 const date = useDateFormat(now, 'YYYY-MM-DD dddd', { locales: locale.value });

 const showUnlockForm = ref(false);
-const validPass = ref(true);
 const { lockScreenPassword } = storeToRefs(lockStore);

 const formState = reactive({
@@ -44,15 +43,14 @@ const formState = reactive({
  submitted: false,
 });

-const passwordStatus = computed(() => {
-  if (formState.submitted && !formState.password) {
-    return 'error';
-  }
+const validPass = computed(
+  () => lockScreenPassword?.value === formState.password,
+);

+const passwordStatus = computed(() => {
  if (formState.submitted && !validPass.value) {
    return 'error';
  }
-
  return 'default';
 });

@@ -62,21 +60,13 @@ const errorTip = computed(() => {
    : $t('widgets.lockScreen.errorPasswordTip');
 });

-watchEffect(() => {
-  if (!formState.password) {
-    validPass.value = true;
-  }
-});
-
 function handleSubmit() {
  formState.submitted = true;
-  if (passwordStatus.value !== 'default') {
-    return;
-  }
-  if (lockScreenPassword?.value !== formState.password) {
-    validPass.value = false;
+
+  if (!validPass.value) {
    return;
  }
+
  lockStore.unlockScreen();
 }

--- a/packages/effects/plugins/package.json
+++ b/packages/effects/plugins/package.json
@@ -23,6 +23,6 @@
    "@vben/preferences": "workspace:*",
    "@vueuse/core": "^11.0.3",
    "echarts": "^5.5.1",
-    "vue": "^3.5.1"
+    "vue": "^3.5.2"
  }
 }
--- a/packages/locales/package.json
+++ b/packages/locales/package.json
@@ -22,7 +22,7 @@
  "dependencies": {
    "@intlify/core-base": "^9.14.0",
    "@vben-core/composables": "workspace:*",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-i18n": "^9.14.0"
  }
 }
--- a/packages/stores/package.json
+++ b/packages/stores/package.json
@@ -24,7 +24,7 @@
    "@vben-core/typings": "workspace:*",
    "pinia": "2.2.2",
    "pinia-plugin-persistedstate": "^3.2.3",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3"
  }
 }
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@vben-core/typings": "workspace:*",
-    "vue": "^3.5.1",
+    "vue": "^3.5.2",
    "vue-router": "^4.4.3"
  }
 }