From cfa92e8cd74acb2511b1e0bd0ba4882c877e23f8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 4 Nov 2024 11:43:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E4=BA=AB=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/share/share/ShareHandler.vue         | 14 ++++++++++++--
 .../src/views/share/share/ShareVisualHead.vue      | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/share/share/ShareHandler.vue b/core/core-frontend/src/views/share/share/ShareHandler.vue
index 1830b0cb42..3597734db8 100644
--- a/core/core-frontend/src/views/share/share/ShareHandler.vue
+++ b/core/core-frontend/src/views/share/share/ShareHandler.vue
@@ -213,7 +213,6 @@ const shareTips = computed(
         : t('work_branch.big_data_screen')
     }`
 )
-const shareDisable = computed(() => shareStore.getShareDisable)
 const sharePeRequire = computed(() => shareStore.getSharePeRequire)
 const editUuid = () => {
   linkCustom.value = true
@@ -275,6 +274,16 @@ const copyInfo = async () => {
         ElMessage.warning(t('work_branch.error_link_hint'))
         return
       }
+      if (passwdEnable.value && !state.detailInfo.autoPwd && existErrorMsg('link-pwd-error-msg')) {
+        ElMessage.warning(t('work_branch.error_password_hint'))
+        return
+      }
+      if (sharePeRequire.value) {
+        const peRequireValid = validatePeRequire()
+        if (!peRequireValid) {
+          return
+        }
+      }
       formatLinkAddr()
       await toClipboard(linkAddr.value)
       ElMessage.success(t('common.copy_success'))
@@ -435,7 +444,8 @@ const validatePwdFormat = () => {
     return false
   }
   const regex = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[!@#$%^&*()_+])[A-Za-z\d!@#$%^&*()_+]{4,10}$/
-  if (!regex.test(val)) {
+  const regep = new RegExp(regex)
+  if (!regep.test(val)) {
     showPageError(t('work_branch.password_hint'), pwdRef)
     return false
   }
diff --git a/core/core-frontend/src/views/share/share/ShareVisualHead.vue b/core/core-frontend/src/views/share/share/ShareVisualHead.vue
index 0efaf72ac6..34e7d9fe00 100644
--- a/core/core-frontend/src/views/share/share/ShareVisualHead.vue
+++ b/core/core-frontend/src/views/share/share/ShareVisualHead.vue
@@ -260,6 +260,16 @@ const copyInfo = async () => {
         ElMessage.warning(t('work_branch.error_link_hint'))
         return
       }
+      if (passwdEnable.value && !state.detailInfo.autoPwd && existErrorMsg('link-pwd-error-msg')) {
+        ElMessage.warning(t('work_branch.error_password_hint'))
+        return
+      }
+      if (sharePeRequire.value) {
+        const peRequireValid = validatePeRequire()
+        if (!peRequireValid) {
+          return
+        }
+      }
       formatLinkAddr()
       await toClipboard(linkAddr.value)
       ElMessage.success(t('common.copy_success'))
@@ -451,7 +461,8 @@ const validatePwdFormat = () => {
     return false
   }
   const regex = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[!@#$%^&*()_+])[A-Za-z\d!@#$%^&*()_+]{4,10}$/
-  if (!regex.test(val)) {
+  const regep = new RegExp(regex)
+  if (!regep.test(val)) {
     showPageError(t('work_branch.password_hint'), pwdRef)
     return false
   }