forked from github/dataease
fix: 上传Excel后,标题上的字段类型下拉框切换字段类型功能异常
This commit is contained in:
parent
6b0f7f2cf1
commit
0728264056
@ -145,19 +145,21 @@
|
||||
>
|
||||
<ux-table-column
|
||||
v-for="field in sheetObj.fields"
|
||||
:key="field.fieldName + field.fieldType"
|
||||
:key="field.fieldName"
|
||||
min-width="200px"
|
||||
:field="field.fieldName"
|
||||
:title="field.remarks"
|
||||
:fieldType="field.fieldType"
|
||||
:resizable="true"
|
||||
>
|
||||
<template slot="header">
|
||||
<template #header>
|
||||
<el-dropdown
|
||||
placement="bottom-start"
|
||||
trigger="click"
|
||||
:key="field.fieldName + field.fieldType"
|
||||
@command="(type) => handleCommand(type, field)"
|
||||
>
|
||||
<span class="type-switch">
|
||||
<span class="type-switch">
|
||||
<svg-icon
|
||||
v-if="field.fieldType === 'TEXT'"
|
||||
icon-class="field_text"
|
||||
|
@ -93,6 +93,7 @@
|
||||
slot="reference"
|
||||
icon-class="de-delete"
|
||||
class="de-delete-icon"
|
||||
:class="[disabled ? 'not-allow' : '']"
|
||||
/>
|
||||
</el-popover>
|
||||
</span>
|
||||
@ -1584,7 +1585,7 @@ export default {
|
||||
margin-right: 20px;
|
||||
color: var(--deTextSecondary, #646a73);
|
||||
}
|
||||
.de-delete-icon {
|
||||
.de-delete-icon:not(.not-allow) {
|
||||
cursor: pointer;
|
||||
&:hover {
|
||||
color: var(--deDanger, #f54a45);
|
||||
|
@ -657,6 +657,9 @@ export default {
|
||||
this.$emit('setParams', { ...this.params })
|
||||
this.$nextTick(() => {
|
||||
this.disabled = appMarketCheck ? !this.appMarketEdit : (Boolean(id) && showModel === 'show' && !this.canEdit)
|
||||
if (this.configFromTabs.editor === 'editor') {
|
||||
this.$emit('editeTodisable', true)
|
||||
}
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
|
@ -64,7 +64,7 @@
|
||||
</div>
|
||||
<div style="height: calc(100% - 36px)">
|
||||
<ds-form-content
|
||||
@editeTodisable="editDatasource(false)"
|
||||
@editeTodisable="editDatasource"
|
||||
ref="DsFormContent"
|
||||
:config-from-tabs="configFromTabs"
|
||||
/>
|
||||
|
@ -705,7 +705,7 @@ export default {
|
||||
},
|
||||
_handleEditer(row) {
|
||||
if (this.showView === 'Datasource') {
|
||||
const param = { ...row, ...{ showModel: 'show' }}
|
||||
const param = { ...row, ...{ showModel: 'show', editor: 'editor' }}
|
||||
this.switchMain('dsTable', param, this.tData, this.dsTypes)
|
||||
this.currentNodeId && sessionStorage.setItem('datasource-current-node', this.currentNodeId)
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user