@@ -1069,49 +1070,83 @@ const addKeywordFromSelection = () => {
}
/** 关键字 Tab 相关 */
-const multipleKeywordSelection = ref([])
+// 关键字
+const keywordList = ref([] as any)
+const multipleKeywordSelection = ref([] as any)
const handleKeywordSelectionChange = (val: any) => {
multipleKeywordSelection.value = val
}
const keyVisible = ref(false)
const keyEditType = ref('')
-const keyWordInput = ref('')
+
+const keyWord = ref('')
+
const editKeyword = (key: string) => {
keyEditType.value = key
+
if (key === 'create') {
- keyWordInput.value = ''
+ keyWord.value = ''
+ keyVisible.value = true
+ } else if (key === 'update') {
+ if (multipleKeywordSelection.value.length === 0) {
+ ElMessage.warning('请先选择一个要编辑的关键字')
+ return
+ }
+ keyWord.value = multipleKeywordSelection.value[0].keyword
keyVisible.value = true
} else if (key === 'delete') {
if (multipleKeywordSelection.value.length === 0) {
- message.warning('请选择要删除的关键字')
+ ElMessage.warning('请先选择要删除的关键字')
return
}
- ElMessageBox.confirm('确定要删除选中的关键字吗？').then(() => {
- const selectedKeywords = multipleKeywordSelection.value.map((item) => item.keyword)
- formData.value.keywords = formData.value.keywords.filter(
- (item) => !selectedKeywords.includes(item.keyword)
- )
- })
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ ElMessage.success('已删除选中项')
} else if (key === 'deleteall') {
- ElMessageBox.confirm('确定要删除所有关键字吗？').then(() => {
- formData.value.keywords = []
- })
+ keywordList.value = []
+ ElMessage.success('已清空关键字列表')
}
+ updateKeywordsToForm()
}
+const updateKeywordsToForm = () => {
+ const keywordStr = keywordList.value
+ .map(item => item.keyword)
+ .filter(k => k && k.trim() !== '')
+ .join(',')
+ formData.value.keywords = keywordStr
+
+ console.log(formData.value.keywords+"formData.value.keywords")
+}
+
+
+function setKao() {
+ kaoDialogVisible.value = true
+}
+
const keyDialogClose = () => {
keyVisible.value = false
}
-
const confirmKeyDialogVisible = () => {
- if (keyEditType.value === 'create' && keyWordInput.value) {
- if (formData.value.keywords.some((item) => item.keyword === keyWordInput.value)) {
- message.warning('关键字已存在')
- return
- }
- formData.value.keywords.push({ keyword: keyWordInput.value })
+ if (keyEditType.value === 'create') {
+ keywordList.value.push({
+ keyword: keyWord.value
+ })
+ } else if (keyEditType.value === 'update') {
+ multipleKeywordSelection.value.forEach(item => {
+ item.keyword = keyWord.value
+ })
+ } else if (keyEditType.value === 'delete') {
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ } else if (keyEditType.value === 'deleteall') {
+ keywordList.value = []
}
+
+ updateKeywordsToForm()
keyVisible.value = false
}
@@ -1249,7 +1284,6 @@ const openPoints = async () => {
:deep(.el-dialog) {
display: flex;
flex-direction: column;
- height: 85vh;
.el-dialog__header {
border-bottom: 1px solid #ededed;
}
diff --git a/src/views/paper/question/ChoiceForm.vue b/src/views/paper/question/ChoiceForm.vue
index 331820c..e53cf45 100644
--- a/src/views/paper/question/ChoiceForm.vue
+++ b/src/views/paper/question/ChoiceForm.vue
@@ -179,7 +179,7 @@
新建
- 编辑
+ 编辑
删除
删除全部
-
@@ -367,12 +367,53 @@ const handleKeywordSelectionChange = (val: any) => {
const keyVisible = ref(false)
const keyEditType = ref('')
-const keyWord = ref([null])
+const keyWord = ref('')
-const editKeyword = (key) => {
+
+const editKeyword = (key: string) => {
keyEditType.value = key
- keyVisible.value = true
+
+ if (key === 'create') {
+ keyWord.value = ''
+ keyVisible.value = true
+ } else if (key === 'update') {
+ if (multipleKeywordSelection.value.length === 0) {
+ ElMessage.warning('请先选择一个要编辑的关键字')
+ return
+ }
+ keyWord.value = multipleKeywordSelection.value[0].keyword
+ keyVisible.value = true
+ } else if (key === 'delete') {
+ if (multipleKeywordSelection.value.length === 0) {
+ ElMessage.warning('请先选择要删除的关键字')
+ return
+ }
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ ElMessage.success('已删除选中项')
+ } else if (key === 'deleteall') {
+ keywordList.value = []
+ ElMessage.success('已清空关键字列表')
+ }
+ updateKeywordsToForm()
}
+const updateKeywordsToForm = () => {
+ const keywordStr = keywordList.value
+ .map(item => item.keyword)
+ .filter(k => k && k.trim() !== '')
+ .join(',')
+ formData.value.keywords = keywordStr
+
+ console.log(formData.value.keywords+"formData.value.keywords")
+}
+
+
+function setKao() {
+ kaoDialogVisible.value = true
+}
+
+
const keyDialogClose = () => {
keyVisible.value = false
}
@@ -381,8 +422,19 @@ const confirmKeyDialogVisible = () => {
keywordList.value.push({
keyword: keyWord.value
})
+ } else if (keyEditType.value === 'update') {
+ multipleKeywordSelection.value.forEach(item => {
+ item.keyword = keyWord.value
+ })
+ } else if (keyEditType.value === 'delete') {
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ } else if (keyEditType.value === 'deleteall') {
+ keywordList.value = []
}
+ updateKeywordsToForm()
keyVisible.value = false
}
diff --git a/src/views/paper/question/EmailForm.vue b/src/views/paper/question/EmailForm.vue
index 28cf9d7..e1ef8f6 100644
--- a/src/views/paper/question/EmailForm.vue
+++ b/src/views/paper/question/EmailForm.vue
@@ -109,6 +109,57 @@
+
+
+
+
+
+
+ 新建
+ 编辑
+ 删除
+ 删除全部
+
+
+
+
+
+ 关键字
+
+
+
+
+
+
+
+
+
@@ -492,16 +543,11 @@ const rightActiveName = ref('annex')
const rightHandleClick = (tab, e) => {
rightActiveName.value = tab.paneName.value
}
-// 关键字
-const multipleKeywordSelection = ref([] as any)
-const handleKeywordSelectionChange = (val: any) => {
- multipleKeywordSelection.value = val
-}
+
const selections = ref([])
const handleSelectionChange = (rows) => {
selections.value = rows
}
-const keyWord = ref([null])
/** 添加/修改操作 */
const FileRef = ref()
@@ -713,6 +759,88 @@ const openPoints = async () => {
await getTree()
dialogVisiblePoints.value = true
}
+
+
+
+// 关键字
+const keywordList = ref([] as any)
+const multipleKeywordSelection = ref([] as any)
+const handleKeywordSelectionChange = (val: any) => {
+ multipleKeywordSelection.value = val
+}
+const keyVisible = ref(false)
+const keyEditType = ref('')
+
+const keyWord = ref('')
+
+
+const editKeyword = (key: string) => {
+ keyEditType.value = key
+
+ if (key === 'create') {
+ keyWord.value = ''
+ keyVisible.value = true
+ } else if (key === 'update') {
+ if (multipleKeywordSelection.value.length === 0) {
+ ElMessage.warning('请先选择一个要编辑的关键字')
+ return
+ }
+ keyWord.value = multipleKeywordSelection.value[0].keyword
+ keyVisible.value = true
+ } else if (key === 'delete') {
+ if (multipleKeywordSelection.value.length === 0) {
+ ElMessage.warning('请先选择要删除的关键字')
+ return
+ }
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ ElMessage.success('已删除选中项')
+ } else if (key === 'deleteall') {
+ keywordList.value = []
+ ElMessage.success('已清空关键字列表')
+ }
+ updateKeywordsToForm()
+}
+const updateKeywordsToForm = () => {
+ const keywordStr = keywordList.value
+ .map(item => item.keyword)
+ .filter(k => k && k.trim() !== '')
+ .join(',')
+ formData.value.keywords = keywordStr
+
+ console.log(formData.value.keywords+"formData.value.keywords")
+}
+
+
+function setKao() {
+ kaoDialogVisible.value = true
+}
+
+
+const keyDialogClose = () => {
+ keyVisible.value = false
+}
+const confirmKeyDialogVisible = () => {
+ if (keyEditType.value === 'create') {
+ keywordList.value.push({
+ keyword: keyWord.value
+ })
+ } else if (keyEditType.value === 'update') {
+ multipleKeywordSelection.value.forEach(item => {
+ item.keyword = keyWord.value
+ })
+ } else if (keyEditType.value === 'delete') {
+ keywordList.value = keywordList.value.filter(
+ item => !multipleKeywordSelection.value.includes(item)
+ )
+ } else if (keyEditType.value === 'deleteall') {
+ keywordList.value = []
+ }
+
+ updateKeywordsToForm()
+ keyVisible.value = false
+}