Merge pull request #4876 from dataease/pr@dev_memory_component

Pr@dev memory component
This commit is contained in:
dataeaseShu 2023-03-24 13:33:04 +08:00 committed by GitHub
commit 7985e26fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 3 deletions

View File

@ -6,6 +6,7 @@
:class="classId"
popper-class="VisualSelects coustom-de-select"
no-match-text=" "
reserve-keyword
clearable
v-bind="$attrs"
v-on="$listeners"
@ -93,7 +94,7 @@ export default {
},
computed: {
isIndeterminate() {
return Array.isArray(this.selectValue) && this.selectValue.length > 0 && this.selectValue.length !== this.list.length
return Array.isArray(this.selectValue) && this.selectValue.length > 0 && this.isAllSelect() > 0 && this.selectValue.length !== this.halfSelect()
}
},
watch: {
@ -218,14 +219,34 @@ export default {
this.domList.style.paddingTop = scrollTop - (scrollTop % this.itemHeight) + 'px'
},
popChange() {
this.$emit('resetKeyWords', '')
this.domList.style.paddingTop = 0 + 'px'
this.startIndex = 0
this.$nextTick(() => {
if (this.$attrs.multiple) {
this.selectAll = this.selectValue.length === this.list.length
}
})
this.resetList()
this.reCacularHeight()
},
isAllSelect() {
let vals = this.list.length
if (this.keyWord.trim()) {
vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).filter(ele => this.selectValue.includes(ele)).length
}
return vals
},
halfSelect() {
let vals = this.list.length
if (this.keyWord.trim()) {
vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).length
}
return vals
},
visualChange(val) {
if (this.$attrs.multiple) {
this.selectAll = val.length === this.list.length
this.selectAll = val.length === this.halfSelect()
}
this.$emit('visual-change', val)
}

View File

@ -16,6 +16,7 @@
:key-word="keyWord"
popper-class="coustom-de-select"
:list="data"
@resetKeyWords="filterMethod"
:custom-style="customStyle"
@change="changeValue"
@focus="setOptionWidth"

View File

@ -570,6 +570,7 @@ export default {
data() {
return {
sceneMode: false,
saveGroupLoading: false,
treeLoading: false,
dialogTitle: '',
search: '',
@ -859,12 +860,16 @@ export default {
saveGroup(group) {
this.$refs['groupForm'].validate((valid) => {
if (valid) {
if (this.saveGroupLoading) return
this.saveGroupLoading = true
addGroup(group).then((res) => {
this.close()
this.openMessageSuccess('dataset.save_success')
this.expandedArray.push(group.pid)
const opt = group.id ? 'rename' : 'new'
updateCacheTree(opt, 'dataset-tree', res.data, this.tData)
}).finally(() => {
this.saveGroupLoading = false
})
} else {
return false

View File

@ -561,6 +561,7 @@ export default {
this.$success(this.$t('commons.save_success'))
this.reset()
this.$emit('saved')
}).finally(() => {
this.loading = false
})
} else {