From 7ab790285f2ab8bd778bf0ef670524305a705eb5 Mon Sep 17 00:00:00 2001
From: chaorenluo <1243357953@qq.com>
Date: Wed, 17 Jul 2024 11:25:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=89=8D=E7=AB=AF=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4=20(#352)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix:修复前端白名单bug

* fix:添加保存和发布检查判断白名单设置是否有误
---
 web/src/common/regexpMap.ts                   | 11 +++
 web/src/management/api/space.ts               |  4 ++
 .../modules/contentModule/PublishPanel.vue    | 19 ++++++
 .../edit/modules/contentModule/SavePanel.vue  | 17 +++++
 .../setters/widgets/teamMemberList.vue        | 68 +++++++------------
 .../materials/setters/widgets/whiteList.vue   | 26 +++++++
 web/src/render/adapter/rules.js               | 12 +---
 web/src/render/api/survey.js                  |  4 +-
 .../render/components/VerifyWhiteDialog.vue   |  5 +-
 web/src/render/pages/RenderPage.vue           |  9 +--
 web/src/render/store/mutations.js             |  4 +-
 web/src/render/store/state.js                 |  4 +-
 12 files changed, 115 insertions(+), 68 deletions(-)
 create mode 100644 web/src/common/regexpMap.ts

diff --git a/web/src/common/regexpMap.ts b/web/src/common/regexpMap.ts
new file mode 100644
index 00000000..1de548a6
--- /dev/null
+++ b/web/src/common/regexpMap.ts
@@ -0,0 +1,11 @@
+export const regexpMap = {
+  nd: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/,
+  m: /^[1]([3-9])[0-9]{9}$/,
+  idcard: /^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$/,
+  strictIdcard:
+    /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
+  n: /^[0-9]+([.]{1}[0-9]+){0,1}$/,
+  e: /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/,
+  licensePlate:
+    /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[a-zA-Z](([DFAG]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))|[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4,5}[A-Z0-9挂学警港澳]{1})$/
+}
\ No newline at end of file
diff --git a/web/src/management/api/space.ts b/web/src/management/api/space.ts
index b0aadda9..94804575 100644
--- a/web/src/management/api/space.ts
+++ b/web/src/management/api/space.ts
@@ -16,6 +16,10 @@ export const getSpaceDetail = (workspaceId: string) => {
   return axios.get(`/workspace/${workspaceId}`)
 }
 
+export const getMemberList = () => {
+  return axios.get('/workspace/member/list')
+}
+
 export const deleteSpace = (workspaceId: string) => {
   return axios.delete(`/workspace/${workspaceId}`)
 }
diff --git a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
index 622698d5..1a54ac77 100644
--- a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
@@ -31,6 +31,17 @@ const updateLogicConf = () => {
   }
 }
 
+const updateWhiteConf = () => {
+  const baseConf = store.state.edit.schema.baseConf || {};
+  if (baseConf.passwordSwitch && !baseConf.password) {
+    return true;
+  }
+  if (baseConf.whitelistType!='ALL' && !baseConf.whitelist?.length) {
+    return true;
+  }
+  return false
+}
+
 const handlePublish = async () => {
   if (isPublishing.value) {
     return
@@ -46,6 +57,14 @@ const handlePublish = async () => {
     return
   }
 
+
+  if(updateWhiteConf()){
+    isPublishing.value = false
+    ElMessage.error('请检查问卷设置是否有误')
+    return
+  }
+
+
   const saveData = buildData(store.state.edit.schema)
   if (!saveData.surveyId) {
     isPublishing.value = false
diff --git a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
index a3f2f3cd..1d4c58e4 100644
--- a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
@@ -63,6 +63,17 @@ const updateLogicConf = () => {
   }
 }
 
+const updateWhiteConf = () => {
+  const baseConf = store.state.edit.schema.baseConf || {};
+  if (baseConf.passwordSwitch && !baseConf.password) {
+    return true;
+  }
+  if (baseConf.whitelistType!='ALL' && !baseConf.whitelist?.length) {
+    return true;
+  }
+  return false
+}
+
 const timerHandle = ref<NodeJS.Timeout | number | null>(null)
 const triggerAutoSave = () => {
   if (autoSaveStatus.value === 'saving') {
@@ -114,6 +125,12 @@ const handleSave = async () => {
     return
   }
 
+  if(updateWhiteConf()){
+    isSaving.value = false
+    ElMessage.error('请检查问卷设置是否有误')
+    return
+  }
+
   try {
     const res: any = await saveData()
     if (res.code === 200) {
diff --git a/web/src/materials/setters/widgets/teamMemberList.vue b/web/src/materials/setters/widgets/teamMemberList.vue
index 4086b499..24c35de3 100644
--- a/web/src/materials/setters/widgets/teamMemberList.vue
+++ b/web/src/materials/setters/widgets/teamMemberList.vue
@@ -9,16 +9,18 @@
   </div>
 </template>
 <script setup>
-import { ref, computed, defineProps, defineEmits, onMounted, nextTick } from 'vue'
-import { useStore } from 'vuex'
+import { ref, computed, defineProps, defineEmits, onMounted } from 'vue'
 import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant'
+import {
+  getMemberList
+} from '@/management/api/space'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
   formConfig: Object,
 })
 const emit = defineEmits([FORM_CHANGE_EVENT_KEY])
 
-const store = useStore();
 const treeRef = ref(null)
 const treeData = ref([])
 const defaultCheckedKeys = ref([])
@@ -30,57 +32,37 @@ const defaultProps = {
 const handleChange = () => {
   const key = props.formConfig.key;
   const userKeys = treeRef.value?.getCheckedKeys(true);
+  if (userKeys.length > 100) {
+    ElMessage.error('最多添加100个')
+    return;
+  }
   emit(FORM_CHANGE_EVENT_KEY, { key: key, value: userKeys });
 }
 
-const spaceDetail = computed(() => {
-  return store.state.list.spaceDetail
-})
-
-
 
 const selectCount = computed(() => {
   return treeRef.value?.getCheckedKeys(true).length || 0
 })
 
-const spaceMenus = computed(() => {
-  return store.state.list.spaceMenus
-})
 
 const getSpaceMenus = async () => {
-  await store.dispatch('list/getSpaceList')
-  spaceMenus.value.map((v) => {
-    if (v.id == "group") {
-      const promiseList = []
-      v.children?.map((item) => {
-        promiseList.push(store.dispatch('list/getSpaceDetail', item.id).then(() => {
-          treeData.value.push({
-            id: item.id,
-            label: item.name,
-            children: getChildren()
-          })
-        }))
-      })
-      Promise.all(promiseList).then(() => {
-        nextTick(() => {
-          defaultCheckedKeys.value = props.formConfig.value;
-        })
-      })
-    }
-  })
-}
-
-const getChildren = () => {
-  const members = [];
-  if (spaceDetail.value?.members?.length > 0) {
-    spaceDetail.value.members.map(v => {
-      members.push({
-        id: v.userId,
-        label: v.username,
-      })
-    })
+  const res = await getMemberList();
+  if (res.code != 200) {
+    ElMessage.error('获取空间成员列表失败');
   }
-  return members
+  const data = res.data;
+  data.map((v) => {
+    const members = v.members || [];
+    treeData.value.push({
+      id: v.ownerId,
+      label: v.name,
+      children: members?.map(v => ({
+        id: v.userId,
+        label: v.role,
+      }))
+    })
+  })
+  defaultCheckedKeys.value = props.formConfig.value;
 }
 
 
diff --git a/web/src/materials/setters/widgets/whiteList.vue b/web/src/materials/setters/widgets/whiteList.vue
index a5a23f72..46cfcbca 100644
--- a/web/src/materials/setters/widgets/whiteList.vue
+++ b/web/src/materials/setters/widgets/whiteList.vue
@@ -45,6 +45,8 @@
 
 import { ref,nextTick } from 'vue'
 import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant'
+import { ElMessage } from 'element-plus'
+import { regexpMap } from '@/common/regexpMap.ts'
 
 const props = defineProps({
   formConfig: Object,
@@ -56,12 +58,36 @@ const memberType = ref(props.formConfig.value[1] || 'MOBILE')
 const whiteVisible = ref(false)
 const whiteTextarea = ref(whitelist.value.join(','))
 
+const regularMap = {
+  MOBILE:regexpMap.m,
+  EMAIL:regexpMap.e
+}
+
+
+const checkValRule = (list) => {
+  let status = false;
+  if (list.length > 100) { 
+    ElMessage.error('最多添加100个')
+    return true;
+  };
+  const pattern = regularMap[memberType.value];
+  if(!pattern) return false;
+  for (let i = 0; i < list.length; i++) {
+    if (!pattern.test(list[i])) {
+      status = true;
+      ElMessage.error('数据格式错误，请检查后重新输入~')
+      break;
+    }
+  }
+  return status;
+}
 
 
 
 const handleChange = () => {
   const keys = props.formConfig.keys;
   const list = whiteTextarea.value ? whiteTextarea.value.split(',') : []
+  if(checkValRule(list)) return
   emit(FORM_CHANGE_EVENT_KEY, { key:keys[0], value: list });
   emit(FORM_CHANGE_EVENT_KEY, { key: keys[1], value: memberType.value })
   whiteVisible.value = false
diff --git a/web/src/render/adapter/rules.js b/web/src/render/adapter/rules.js
index 22eb496c..e3c09aaa 100644
--- a/web/src/render/adapter/rules.js
+++ b/web/src/render/adapter/rules.js
@@ -6,18 +6,8 @@ import {
   set as _set
 } from 'lodash-es'
 import { INPUT, RATES, QUESTION_TYPE } from '@/common/typeEnum.ts'
+import { regexpMap } from '@/common/regexpMap.ts'
 
-const regexpMap = {
-  nd: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/,
-  m: /^[1]([3-9])[0-9]{9}$/,
-  idcard: /^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$/,
-  strictIdcard:
-    /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
-  n: /^[0-9]+([.]{1}[0-9]+){0,1}$/,
-  e: /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/,
-  licensePlate:
-    /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[a-zA-Z](([DFAG]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))|[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4,5}[A-Z0-9挂学警港澳]{1})$/
-}
 
 const msgMap = {
   '*': '必填',
diff --git a/web/src/render/api/survey.js b/web/src/render/api/survey.js
index c7013770..988da894 100644
--- a/web/src/render/api/survey.js
+++ b/web/src/render/api/survey.js
@@ -33,9 +33,9 @@ export const getEncryptInfo = () => {
   return axios.get('/clientEncrypt/getEncryptInfo')
 }
 
-export const validate = ({ surveyPath,password, value }) => {
+export const validate = ({ surveyPath,password, whitelist }) => {
   return axios.post(`/responseSchema/${surveyPath}/validate`, {
     password,
-    value
+    whitelist
   })
 }
\ No newline at end of file
diff --git a/web/src/render/components/VerifyWhiteDialog.vue b/web/src/render/components/VerifyWhiteDialog.vue
index 7188023e..818d304a 100644
--- a/web/src/render/components/VerifyWhiteDialog.vue
+++ b/web/src/render/components/VerifyWhiteDialog.vue
@@ -71,19 +71,18 @@ const handleSubmit = async() => {
     surveyPath:surveyPath.value
   }
   if (isValue.value) {
-    params.value = state.value
+    params.whitelist = state.value
   }
   if(isPwd.value){
     params.password = state.password
   }
-
   const res = await validate(params)
   if (res.code != 200) { 
     ElMessage.error(res.errmsg || '验证失败')
     return
   }
   whiteVisible.value = false
-  store.commit('setVerifyId', res.data.verifyId)
+  store.commit('setWhiteData',params)
 }
 
 watch(()=>baseConf.value, () => {
diff --git a/web/src/render/pages/RenderPage.vue b/web/src/render/pages/RenderPage.vue
index 5f0e4504..98b479de 100644
--- a/web/src/render/pages/RenderPage.vue
+++ b/web/src/render/pages/RenderPage.vue
@@ -65,7 +65,7 @@ const renderData = computed(() => store.getters.renderData)
 const submitConf = computed(() => store.state?.submitConf || {})
 const logoConf = computed(() => store.state?.bottomConf || {})
 const surveyPath = computed(() => store.state?.surveyPath || '')
-const verifyId = computed(() => store.state?.verifyId || '')
+const whiteData = computed(() => store.state?.whiteData || {})
 
 const validate = (cbk: (v: boolean) => void) => {
   const index = 0
@@ -81,11 +81,8 @@ const normalizationRequestBody = () => {
     surveyPath: surveyPath.value,
     data: JSON.stringify(formValues),
     difTime: Date.now() - enterTime,
-    clientTime: Date.now()
-  }
-
-  if(verifyId.value){
-    result.verifyId = verifyId.value
+    clientTime: Date.now(),
+    ...whiteData.value
   }
 
   if (encryptInfo?.encryptType) {
diff --git a/web/src/render/store/mutations.js b/web/src/render/store/mutations.js
index 939b3fa9..39585610 100644
--- a/web/src/render/store/mutations.js
+++ b/web/src/render/store/mutations.js
@@ -50,7 +50,7 @@ export default {
   setRuleEgine(state, ruleEngine) {
     state.ruleEngine = ruleEngine
   },
-  setVerifyId(state, verifyId) {
-    state.verifyId = verifyId
+  setWhiteData(state, data) {
+    state.whiteData = data
   }
 }
diff --git a/web/src/render/store/state.js b/web/src/render/store/state.js
index 8c1da777..11ba0ef0 100644
--- a/web/src/render/store/state.js
+++ b/web/src/render/store/state.js
@@ -13,5 +13,7 @@ export default {
   voteMap: {},
   encryptInfo: null,
   ruleEngine: null,
-  verifyId:''
+  whiteData: {
+    
+  }
 }