Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -18,7 +18,24 @@ import StandardSelectionModal from './StandardSelectionModal'
|
||||
export default {
|
||||
name: 'StandardSelection',
|
||||
components: { StandardSelectionModal },
|
||||
props: ['query', 'value', 'standard'],
|
||||
props: {
|
||||
type: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
},
|
||||
value: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
standard: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
isDisabled () {
|
||||
if (this.query.dbFieldName === 'replaced_standard') {
|
||||
|
||||
@@ -58,7 +58,20 @@ import JDictSelectTag from '../dict/JDictSelectTag'
|
||||
export default {
|
||||
name: 'StandardSelectionModal',
|
||||
components: { JDictSelectTag },
|
||||
props: ['query', 'standard'],
|
||||
props: {
|
||||
type: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
},
|
||||
standard: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
visible: false,
|
||||
|
||||
Reference in New Issue
Block a user