fix: 1、还原setting界面ctime、utime、enabled等字段;2、调整entity setting列表间距
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
<div class="col-resize-area"></div>
|
<div class="col-resize-area"></div>
|
||||||
</template>
|
</template>
|
||||||
<template #default="scope" :column="item">
|
<template #default="scope" :column="item">
|
||||||
<template v-if="item.prop === 'create_time' || item.prop === 'update_time'">
|
<template v-if="item.prop === 'ctime' || item.prop === 'utime'">
|
||||||
<template v-if="scope.row[item.prop]">
|
<template v-if="scope.row[item.prop]">
|
||||||
{{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
|
{{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
|
||||||
</template>
|
</template>
|
||||||
@@ -83,13 +83,13 @@ export default {
|
|||||||
prop: 'entitySource',
|
prop: 'entitySource',
|
||||||
show: true,
|
show: true,
|
||||||
sortable: 'custom',
|
sortable: 'custom',
|
||||||
minWidth: 200
|
minWidth: 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('setting.entityTypes'),
|
label: this.$t('setting.entityTypes'),
|
||||||
prop: 'entities',
|
prop: 'entities',
|
||||||
show: true,
|
show: true,
|
||||||
minWidth: 200
|
minWidth: 150
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('setting.relationTypes'),
|
label: this.$t('setting.relationTypes'),
|
||||||
@@ -99,14 +99,15 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('config.user.createTime'),
|
label: this.$t('config.user.createTime'),
|
||||||
prop: 'create_time',
|
prop: 'ctime',
|
||||||
show: true,
|
show: true,
|
||||||
minWidth: 200
|
minWidth: 150
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('overall.updateTime'),
|
label: this.$t('overall.updateTime'),
|
||||||
prop: 'update_time',
|
prop: 'utime',
|
||||||
show: true
|
show: true,
|
||||||
|
minWidth: 150
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<div class="col-resize-area"></div>
|
<div class="col-resize-area"></div>
|
||||||
</template>
|
</template>
|
||||||
<template #default="scope" :column="item">
|
<template #default="scope" :column="item">
|
||||||
<template v-if="item.prop === 'create_time'">
|
<template v-if="item.prop === 'ctime'">
|
||||||
<template v-if="scope.row[item.prop]">
|
<template v-if="scope.row[item.prop]">
|
||||||
{{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
|
{{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
|
||||||
</template>
|
</template>
|
||||||
@@ -144,7 +144,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('config.user.createTime'),
|
label: this.$t('config.user.createTime'),
|
||||||
prop: 'create_time',
|
prop: 'ctime',
|
||||||
show: true,
|
show: true,
|
||||||
minWidth: 150
|
minWidth: 150
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -182,10 +182,10 @@
|
|||||||
<div class="switch__block margin-20">
|
<div class="switch__block margin-20">
|
||||||
<div class="block-title">{{ $t('overall.status') }}</div>
|
<div class="block-title">{{ $t('overall.status') }}</div>
|
||||||
<el-switch
|
<el-switch
|
||||||
v-model="editObj.is_valid"
|
v-model="editObj.enable"
|
||||||
:active-value="1"
|
:active-value="1"
|
||||||
:inactive-value="0"
|
:inactive-value="0"
|
||||||
:active-text="$t(switchStatus(editObj.is_valid))"/>
|
:active-text="$t(switchStatus(editObj.enable))"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -295,7 +295,7 @@ export default {
|
|||||||
relationData: {
|
relationData: {
|
||||||
data: [{ from_entity_index: '', to_entity_index: '', type: '', fromDisabled: false, toDisabled: false }]
|
data: [{ from_entity_index: '', to_entity_index: '', type: '', fromDisabled: false, toDisabled: false }]
|
||||||
},
|
},
|
||||||
is_valid: 1
|
enable: 1
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -142,10 +142,10 @@
|
|||||||
<div class="form-setting__block margin-b-20">
|
<div class="form-setting__block margin-b-20">
|
||||||
<div class="block-title">{{ $t('overall.status') }}</div>
|
<div class="block-title">{{ $t('overall.status') }}</div>
|
||||||
<el-switch
|
<el-switch
|
||||||
v-model="sourceObj.is_valid"
|
v-model="sourceObj.enable"
|
||||||
:active-value="1"
|
:active-value="1"
|
||||||
:inactive-value="0"
|
:inactive-value="0"
|
||||||
:active-text="$t(switchStatus(sourceObj.is_valid))"/>
|
:active-text="$t(switchStatus(sourceObj.enable))"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -482,7 +482,7 @@ export default {
|
|||||||
data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
|
data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
|
||||||
},
|
},
|
||||||
description: '',
|
description: '',
|
||||||
is_valid: 1
|
enable: 1
|
||||||
}
|
}
|
||||||
const sourceObj = ref(_.cloneDeep(blankObject))
|
const sourceObj = ref(_.cloneDeep(blankObject))
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user