fix: 1、source新增/编辑页面去除enable内容;2、profile的新增/编辑界面,mapping块加块级的删除按钮
This commit is contained in:
@@ -126,16 +126,27 @@ $border-color-light: var(--el-border-color-light);
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: var(--el-text-color-primary);
|
color: var(--el-text-color-primary);
|
||||||
font-weight: bold;
|
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
|
||||||
|
.block-header__title {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
div:nth-child(1) {
|
div:nth-child(1) {
|
||||||
width: 288px;
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
color: var(--el-text-color-regular);
|
||||||
|
font-size: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.block-header__menu {
|
.block-header__menu {
|
||||||
display: flex;
|
display: flex;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
font-weight: bold;
|
||||||
|
|
||||||
div:nth-child(1) {
|
div:nth-child(1) {
|
||||||
width: 278px;
|
width: 278px;
|
||||||
|
|||||||
@@ -91,6 +91,8 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.disableEdit = this.batchDeleteObjs.length !== 1
|
this.disableEdit = this.batchDeleteObjs.length !== 1
|
||||||
|
// todo 该字段后续会修改
|
||||||
|
this.disableEdit = !!objs.flag
|
||||||
this.disableDelete = this.batchDeleteObjs.length < 1
|
this.disableDelete = this.batchDeleteObjs.length < 1
|
||||||
},
|
},
|
||||||
getTableData (params, isAll, isClearType) {
|
getTableData (params, isAll, isClearType) {
|
||||||
|
|||||||
@@ -37,7 +37,10 @@
|
|||||||
<el-form :model="editObj.schemaMappingData" ref="mappingForm">
|
<el-form :model="editObj.schemaMappingData" ref="mappingForm">
|
||||||
<div class="form-content__block" v-for="(item, index) in editObj.schemaMappingData.data" :key="index">
|
<div class="form-content__block" v-for="(item, index) in editObj.schemaMappingData.data" :key="index">
|
||||||
<div class="block-header">
|
<div class="block-header">
|
||||||
|
<div class="block-header__title">
|
||||||
<div>{{ item.name }}</div>
|
<div>{{ item.name }}</div>
|
||||||
|
<i class="cn-icon cn-icon-close" @click="deleteMappingItem(index)"></i>
|
||||||
|
</div>
|
||||||
<div class="block-header__menu">
|
<div class="block-header__menu">
|
||||||
<div>{{ $t('setting.entityField') }}</div>
|
<div>{{ $t('setting.entityField') }}</div>
|
||||||
<div>{{ $t('setting.sourceField') }}</div>
|
<div>{{ $t('setting.sourceField') }}</div>
|
||||||
@@ -457,7 +460,9 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
const type = this.editObj.schemaMappingData.data[index].type
|
const type = this.editObj.schemaMappingData.data[index].type
|
||||||
if (this.editObj.schemaMappingData.data[index].list.length > 1) {
|
if (this.editObj.schemaMappingData.data[index].list.length > 1) {
|
||||||
|
if (ind >= 0) {
|
||||||
this.editObj.schemaMappingData.data[index].list.splice(ind, 1)
|
this.editObj.schemaMappingData.data[index].list.splice(ind, 1)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.editObj.schemaMappingData.data.splice(index, 1)
|
this.editObj.schemaMappingData.data.splice(index, 1)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,14 +139,14 @@
|
|||||||
v-model="sourceObj.description"
|
v-model="sourceObj.description"
|
||||||
id="role-box-input-remark"/>
|
id="role-box-input-remark"/>
|
||||||
|
|
||||||
<div class="form-setting__block margin-b-20">
|
<!-- <div class="form-setting__block margin-b-20">-->
|
||||||
<div class="block-title"><span class="from-dot">*</span>{{ $t('overall.status') }}</div>
|
<!-- <div class="block-title"><span class="from-dot">*</span>{{ $t('overall.status') }}</div>-->
|
||||||
<el-switch
|
<!-- <el-switch-->
|
||||||
v-model="sourceObj.enable"
|
<!-- v-model="sourceObj.enable"-->
|
||||||
:active-value="1"
|
<!-- :active-value="1"-->
|
||||||
:inactive-value="0"
|
<!-- :inactive-value="0"-->
|
||||||
:active-text="$t(switchStatus(sourceObj.enable))"/>
|
<!-- :active-text="$t(switchStatus(sourceObj.enable))"/>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="sources-form__footer">
|
<div class="sources-form__footer">
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
<span>{{ $t('overall.cancel') }}</span>
|
<span>{{ $t('overall.cancel') }}</span>
|
||||||
</button>
|
</button>
|
||||||
<button style="position: relative;" :class="{'disabled': blockOperation.save}"
|
<button style="position: relative;" :class="{'disabled': blockOperation.save}"
|
||||||
:disabled="blockOperation.save" class="business-button tag__btn" @click="saveSource">
|
:disabled="sourceObj.flag" class="business-button tag__btn" @click="saveSource">
|
||||||
<loading :loading="blockOperation.save"></loading>
|
<loading :loading="blockOperation.save"></loading>
|
||||||
<span>{{ $t('overall.save') }}</span>
|
<span>{{ $t('overall.save') }}</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -349,6 +349,7 @@ export default {
|
|||||||
})
|
})
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
delete this.sourceObj.enable
|
||||||
this.myLoading = true
|
this.myLoading = true
|
||||||
if (!this.sourceId) {
|
if (!this.sourceId) {
|
||||||
// post调用是新增,put是编辑
|
// post调用是新增,put是编辑
|
||||||
@@ -503,8 +504,8 @@ export default {
|
|||||||
lookupsData: {
|
lookupsData: {
|
||||||
data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
|
data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
|
||||||
},
|
},
|
||||||
description: '',
|
description: ''
|
||||||
enable: 1
|
// enable: 1
|
||||||
}
|
}
|
||||||
const sourceObj = ref(_.cloneDeep(blankObject))
|
const sourceObj = ref(_.cloneDeep(blankObject))
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user