fix: 编辑API数据表-设计验收问题汇总 功能button显示不对

This commit is contained in:
dataeaseShu 2022-12-29 16:55:59 +08:00
parent 6884d51ab5
commit e8ad480c58
9 changed files with 31 additions and 15 deletions

View File

@ -17,9 +17,11 @@ export default {
count: {
update: function(el, binding) {
const { value, maxlength, buttonDisabled } = binding.value
if (buttonDisabled) {
el.removeChild(el.querySelector('.el-input__count'))
if (buttonDisabled && el.querySelector('.el-input__count')) {
el.querySelector('.el-input__count').style.dispaly = 'none'
return
} else if (el.querySelector('.el-input__count')) {
el.querySelector('.el-input__count').style.dispaly = 'block'
}
const lg = value?.length || 0
const count = el.querySelector('.el-input__count')

View File

@ -381,6 +381,7 @@ export default {
ukey_title: 'API Keys',
thumbnail: 'thumbnail',
confirm_delete: 'Confirm delete',
delete_this_dashboard: 'Are you sure to delete this dashboard?',
confirm_stop: 'Confirm stop',
stop_success: 'Stop success',
treeselect: {

View File

@ -381,6 +381,7 @@ export default {
ukey_title: 'API Keys',
thumbnail: '縮略圖',
confirm_delete: '確認刪除',
delete_this_dashboard: '確認删除該儀錶板嗎?',
confirm_stop: '確認停止',
stop_success: '停止成功',
treeselect: {

View File

@ -380,6 +380,7 @@ export default {
ukey_title: 'API Keys',
thumbnail: '缩略图',
confirm_delete: '确认删除',
delete_this_dashboard: '确认删除该仪表板吗?',
confirm_stop: '确认停止',
stop_success: '停止成功',
treeselect: {

View File

@ -931,9 +931,12 @@ export default {
options.link = this.$t('datasource.click_to_check')
options.content = this.$t('datasource.cannot_be_deleted_dataset')
options.templateDel = msgContent
options.confirmButtonText = undefined
options.type = 'danger'
options.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(options)
this.withLink(options, this.$t('commons.delete'))
return
}
this.handlerConfirm(options)

View File

@ -458,10 +458,12 @@ import { mapState } from 'vuex'
import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel'
import TreeSelector from '@/components/treeSelector'
import { queryAuthModel } from '@/api/authModel/authModel'
import msgCfm from '@/components/msgCfm/index'
export default {
name: 'PanelList',
components: { GrantAuth, LinkGenerate, EditPanel, TreeSelector },
mixins: [msgCfm],
data() {
return {
lastActiveDefaultPanelId: null, //
@ -856,12 +858,10 @@ export default {
},
delete(data) {
this.$confirm(this.$t('panel.confirm_delete'), this.$t('panel.tips'), {
confirmButtonText: this.$t('panel.confirm'),
cancelButtonText: this.$t('panel.cancel'),
type: 'warning'
})
.then(() => {
const params = {
title: 'commons.delete_this_dashboard',
type: 'danger',
cb: () => {
delGroup(data.id).then((response) => {
this.$message({
type: 'success',
@ -872,9 +872,9 @@ export default {
this.tree()
this.defaultTree(false)
})
})
.catch(() => {
})
}
}
this.handlerConfirm(params, this.$t('commons.delete'))
},
clearCanvas() {

View File

@ -449,7 +449,7 @@
v-closePress
:title="api_table_title"
:visible.sync="edit_api_item"
custom-class="api-datasource-drawer"
custom-class="api-datasource-drawer ds-configuration-input"
size="840px"
:before-close="closeEditItem"
direction="rtl"
@ -1517,6 +1517,12 @@ export default {
text-overflow: ellipsis;
}
}
.ds-configuration-input {
.el-input__inner {
color: var(--deTextPrimary, #1F2329);
}
}
.checkbox-table {
.el-checkbox {
display: flex;

View File

@ -661,7 +661,7 @@ export default {
},
methods: {
editDatasource(type) {
this.canEdit = type
this.$emit('update:canEdit', type)
this.disabled = !type
},
baseInfoDisabledCheck(privileges) {

View File

@ -23,11 +23,13 @@
<deBtn
v-if="privileges && canEdit"
secondary
key="cancel"
@click="editDatasource(false)"
>{{ $t('commons.cancel') }}
</deBtn>
<deBtn
v-if="privileges && !canEdit"
key="edit"
secondary
@click="editDatasource(true)"
>{{ $t('commons.edit') }}
@ -54,7 +56,7 @@
>{{ $t('commons.validate') }}
</deBtn>
<deBtn
v-if="privileges"
v-if="privileges && canEdit"
type="primary"
@click="save"
>{{ $t('commons.save') }}