Merge remote-tracking branch 'origin/main'

This commit is contained in:
赵霄
2023-09-14 09:56:57 +08:00
2 changed files with 32 additions and 2 deletions
+18 -1
View File
@@ -18,7 +18,24 @@ import StandardSelectionModal from './StandardSelectionModal'
export default { export default {
name: 'StandardSelection', name: 'StandardSelection',
components: { StandardSelectionModal }, components: { StandardSelectionModal },
props: ['query', 'value', 'standard'], props: {
type: {
type: Object,
default: () => {
return {}
}
},
value: {
type: String,
default: ''
},
standard: {
type: String,
default: () => {
return {}
}
}
},
computed: { computed: {
isDisabled () { isDisabled () {
if (this.query.dbFieldName === 'replaced_standard') { if (this.query.dbFieldName === 'replaced_standard') {
@@ -58,7 +58,20 @@ import JDictSelectTag from '../dict/JDictSelectTag'
export default { export default {
name: 'StandardSelectionModal', name: 'StandardSelectionModal',
components: { JDictSelectTag }, components: { JDictSelectTag },
props: ['query', 'standard'], props: {
type: {
type: Object,
default: () => {
return {}
}
},
standard: {
type: String,
default: () => {
return {}
}
}
},
data () { data () {
return { return {
visible: false, visible: false,