github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1579 from dataease/pr@dev@fix_select_grid

Browse Source 
fix: 下拉列表逻辑
This commit is contained in:
fit2cloud-chenyw 2021-12-31 10:31:14 +08:00 committed by GitHub
commit e4c47b2e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/src/components/widget/DeWidget/DeSelectGrid.vue
View File

@ -17,13 +17,13 @@
{{ $t('commons.all') }}</el-checkbox> {{ $t('commons.all') }}</el-checkbox>
<el-checkbox-group v-model="value" @change="handleCheckedChange"> <el-checkbox-group v-model="value" @change="handleCheckedChange">
<el-checkbox v-for="item in datas.filter(node => node.id && node.id.includes(keyWord))" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox> <el-checkbox v-for="item in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div v-else class="radio-group-container"> <div v-else class="radio-group-container">
<el-radio-group v-model="value" @change="changeRadioBox"> <el-radio-group v-model="value" @change="changeRadioBox">
<el-radio v-for="(item, index) in datas.filter(node => node.id && node.id.includes(keyWord))" :key="index" :label="item.id" @click.native.prevent="testChange(item)"> <el-radio v-for="(item, index) in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
<span>{{ item.id }}</span> <span>{{ item.id }}</span>
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
@ -36,8 +36,8 @@
</template> </template>
<script> <script>
import {multFieldValues, linkMultFieldValues} from '@/api/dataset/dataset' import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
import {getLinkToken, getToken} from "@/utils/auth"; import { getLinkToken, getToken } from '@/utils/auth'
export default { export default {
props: { props: {
@ -109,7 +109,7 @@ export default {
'element.options.attrs.fieldId': function(value, old) { 'element.options.attrs.fieldId': function(value, old) {
if (typeof value === 'undefined' || value === old) return if (typeof value === 'undefined' || value === old) return
this.datas = [] this.datas = []
let method = multFieldValues let method = multFieldValues
const token = this.$store.getters.token || getToken() const token = this.$store.getters.token || getToken()
const linkToken = this.$store.getters.linkToken || getLinkToken() const linkToken = this.$store.getters.linkToken || getLinkToken()
if (!token && linkToken) { if (!token && linkToken) {
@ -117,16 +117,16 @@ export default {
} }
this.element.options.attrs.fieldId && this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 && this.element.options.attrs.fieldId.length > 0 &&
method({fieldIds: this.element.options.attrs.fieldId.split(',')}).then(res => { method({ fieldIds: this.element.options.attrs.fieldId.split(',') }).then(res => {
this.datas = this.optionDatas(res.data) this.datas = this.optionDatas(res.data)
}) || (this.element.options.value = '') }) || (this.element.options.value = '')
}, },
'element.options.attrs.multiple': function(value, old) { 'element.options.attrs.multiple': function(value, old) {
if (typeof old === 'undefined' || value === old) return if (typeof old === 'undefined' || value === old) return
if (!this.inDraw) { // if (!this.inDraw) {
this.value = value ? [] : null this.value = value ? [] : null
this.element.options.value = '' this.element.options.value = ''
} // }
this.show = false this.show = false
this.$nextTick(() => { this.$nextTick(() => {
@ -148,7 +148,7 @@ export default {
if (!token && linkToken) { if (!token && linkToken) {
method = linkMultFieldValues method = linkMultFieldValues
} }
method({fieldIds: this.element.options.attrs.fieldId.split(',')}).then(res => { method({ fieldIds: this.element.options.attrs.fieldId.split(',') }).then(res => {
this.datas = this.optionDatas(res.data) this.datas = this.optionDatas(res.data)
if (this.element.options.attrs.multiple) { if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length this.checkAll = this.value.length === this.datas.length