diff --git a/src/assets/css/components/views/setting/entitySettingForm.scss b/src/assets/css/components/views/setting/entitySettingForm.scss index 095e1ea3..c746ae61 100644 --- a/src/assets/css/components/views/setting/entitySettingForm.scss +++ b/src/assets/css/components/views/setting/entitySettingForm.scss @@ -126,16 +126,27 @@ $border-color-light: var(--el-border-color-light); flex-direction: column; font-size: 12px; color: var(--el-text-color-primary); - font-weight: bold; margin-bottom: 10px; - div:nth-child(1) { - width: 288px; + .block-header__title { + display: flex; + justify-content: space-between; + + div:nth-child(1) { + font-weight: bold; + } + + i { + color: var(--el-text-color-regular); + font-size: 10px; + cursor: pointer; + } } .block-header__menu { display: flex; padding: 10px; + font-weight: bold; div:nth-child(1) { width: 278px; diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js index 3fb259f0..b1ff5194 100644 --- a/src/mixins/data-list.js +++ b/src/mixins/data-list.js @@ -91,6 +91,8 @@ export default { } }) this.disableEdit = this.batchDeleteObjs.length !== 1 + // todo 该字段后续会修改 + this.disableEdit = !!objs.flag this.disableDelete = this.batchDeleteObjs.length < 1 }, getTableData (params, isAll, isClearType) { diff --git a/src/views/setting/entitySetting/EntitySettingForm.vue b/src/views/setting/entitySetting/EntitySettingForm.vue index 91622a55..1a495306 100644 --- a/src/views/setting/entitySetting/EntitySettingForm.vue +++ b/src/views/setting/entitySetting/EntitySettingForm.vue @@ -37,7 +37,10 @@
-
{{ item.name }}
+
+
{{ item.name }}
+ +
{{ $t('setting.entityField') }}
{{ $t('setting.sourceField') }}
@@ -457,7 +460,9 @@ export default { } else { const type = this.editObj.schemaMappingData.data[index].type if (this.editObj.schemaMappingData.data[index].list.length > 1) { - this.editObj.schemaMappingData.data[index].list.splice(ind, 1) + if (ind >= 0) { + this.editObj.schemaMappingData.data[index].list.splice(ind, 1) + } } else { this.editObj.schemaMappingData.data.splice(index, 1) } diff --git a/src/views/setting/sources/SourcesForm.vue b/src/views/setting/sources/SourcesForm.vue index 40003c98..227a866c 100644 --- a/src/views/setting/sources/SourcesForm.vue +++ b/src/views/setting/sources/SourcesForm.vue @@ -139,14 +139,14 @@ v-model="sourceObj.description" id="role-box-input-remark"/> -
-
*{{ $t('overall.status') }}
- -
+ + + + + + + +