forked from github/dataease
Merge pull request #2342 from dataease/pr@dev@style_dataset_union_form
style: 禁止数据源中修改全局控件样式，恢复关联数据集form中样式属性
This commit is contained in:
fit2cloud-chenyw
GitHub
commit
9662fb72fd
@ -10,7 +10,6 @@
|
||||
<el-button v-else size="mini" style="float: right;" type="primary" @click="changeEdit">{{ $t('commons.edit') }}
|
||||
</el-button>
|
||||
|
||||
|
||||
</template>
|
||||
<div>
|
||||
|
||||
@ -34,6 +33,7 @@
|
||||
v-model="driverForm.type"
|
||||
:placeholder="$t('datasource.please_choose_type')"
|
||||
class="select-width"
|
||||
style="width: 100%"
|
||||
disabled
|
||||
filterable
|
||||
>
|
||||
@ -66,7 +66,6 @@
|
||||
<el-input v-model="driverForm.driverClass" autocomplete="off" />
|
||||
</el-form-item>
|
||||
|
||||
|
||||
</el-form>
|
||||
|
||||
<el-upload
|
||||
@ -102,13 +101,13 @@
|
||||
import LayoutContent from '@/components/business/LayoutContent'
|
||||
import i18n from '@/lang/index'
|
||||
import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
|
||||
import DsConfiguration from "@/views/system/datasource/DsConfiguration";
|
||||
import DsConfiguration from '@/views/system/datasource/DsConfiguration'
|
||||
import PluginCom from '@/views/system/plugin/PluginCom'
|
||||
import {deleteDriverFile, listDriverDetails, updateDriver} from "@/api/system/datasource";
|
||||
import {delUser} from "@/api/system/user";
|
||||
import {$alert} from "@/utils/message";
|
||||
import store from "@/store";
|
||||
import {getToken} from "@/utils/auth";
|
||||
import { deleteDriverFile, listDriverDetails, updateDriver } from '@/api/system/datasource'
|
||||
import { delUser } from '@/api/system/user'
|
||||
import { $alert } from '@/utils/message'
|
||||
import store from '@/store'
|
||||
import { getToken } from '@/utils/auth'
|
||||
|
||||
const token = getToken()
|
||||
|
||||
@ -179,7 +178,6 @@ export default {
|
||||
mounted() {
|
||||
},
|
||||
|
||||
|
||||
methods: {
|
||||
beforeUpload(file) {
|
||||
this.uploading = true
|
||||
@ -256,13 +254,13 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-input {
|
||||
/* .el-input {
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
.el-select {
|
||||
width: 300px;
|
||||
}
|
||||
} */
|
||||
|
||||
.ms-http-input {
|
||||
width: 500px;
|
||||
|
||||
@ -28,9 +28,10 @@
|
||||
v-model="form.type"
|
||||
:placeholder="$t('datasource.please_choose_type')"
|
||||
class="select-width"
|
||||
style="width: 100%"
|
||||
:disabled="formType=='modify' || (formType==='add' && params && !!params.type)"
|
||||
@change="changeType()"
|
||||
filterable
|
||||
@change="changeType()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dsTypes"
|
||||
@ -46,6 +47,7 @@
|
||||
v-model="form.configuration.customDriver"
|
||||
:placeholder="$t('driver.please_choose_driver')"
|
||||
class="select-width"
|
||||
style="width: 100%"
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
@ -58,27 +60,35 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<ds-configuration ref="dsConfig" v-if="!datasourceType.isPlugin" :datasource-type='datasourceType' :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit"></ds-configuration>
|
||||
<plugin-com ref="pluginDsConfig" v-if="datasourceType.isPlugin" :component-name="datasourceType.type" :obj="{form, disabled }" />
|
||||
|
||||
<ds-configuration v-if="!datasourceType.isPlugin" ref="dsConfig" :datasource-type="datasourceType" :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit" />
|
||||
<plugin-com v-if="datasourceType.isPlugin" ref="pluginDsConfig" :component-name="datasourceType.type" :obj="{form, disabled }" />
|
||||
|
||||
</el-form>
|
||||
|
||||
|
||||
<div v-if="canEdit" slot="footer" class="dialog-footer">
|
||||
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
@click="validaDatasource">{{ $t('commons.validate') }}
|
||||
<el-button
|
||||
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
@click="validaDatasource"
|
||||
>{{ $t('commons.validate') }}
|
||||
</el-button>
|
||||
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
|
||||
@click="save">{{ $t('commons.save') }}
|
||||
<el-button
|
||||
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
type="primary"
|
||||
@click="save"
|
||||
>{{ $t('commons.save') }}
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else slot="footer" class="dialog-footer">
|
||||
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
@click="validaDatasource">{{ $t('commons.validate') }}
|
||||
<el-button
|
||||
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
@click="validaDatasource"
|
||||
>{{ $t('commons.validate') }}
|
||||
</el-button>
|
||||
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
|
||||
@click="changeEdit">{{ $t('commons.edit') }}
|
||||
<el-button
|
||||
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
|
||||
type="primary"
|
||||
@click="changeEdit"
|
||||
>{{ $t('commons.edit') }}
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@ -99,7 +109,7 @@ import {
|
||||
import { $confirm } from '@/utils/message'
|
||||
import i18n from '@/lang/index'
|
||||
import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
|
||||
import DsConfiguration from "@/views/system/datasource/DsConfiguration";
|
||||
import DsConfiguration from '@/views/system/datasource/DsConfiguration'
|
||||
import PluginCom from '@/views/system/plugin/PluginCom'
|
||||
|
||||
export default {
|
||||
@ -216,9 +226,9 @@ export default {
|
||||
request: {
|
||||
headers: [{}],
|
||||
body: {
|
||||
"type": "",
|
||||
"raw": "",
|
||||
"kvs": []
|
||||
'type': '',
|
||||
'raw': '',
|
||||
'kvs': []
|
||||
}
|
||||
},
|
||||
fields: []
|
||||
@ -232,9 +242,9 @@ export default {
|
||||
request: {
|
||||
headers: [],
|
||||
body: {
|
||||
"type": "",
|
||||
"raw": "",
|
||||
"kvs": []
|
||||
'type': '',
|
||||
'raw': '',
|
||||
'kvs': []
|
||||
},
|
||||
authManager: {}
|
||||
},
|
||||
@ -288,7 +298,6 @@ export default {
|
||||
connectTimeout: 5,
|
||||
customDriver: 'default'
|
||||
}
|
||||
|
||||
},
|
||||
changeEdit() {
|
||||
this.canEdit = true
|
||||
@ -328,14 +337,14 @@ export default {
|
||||
return
|
||||
}
|
||||
let repeat = false
|
||||
let repeatDsName = []
|
||||
const repeatDsName = []
|
||||
this.tData.forEach(item => {
|
||||
if (item.id === this.form.type) {
|
||||
item.children.forEach(child => {
|
||||
if (this.formType === 'modify' && child.id === this.form.id) {
|
||||
return
|
||||
}
|
||||
let configuration = JSON.parse(child.configuration)
|
||||
const configuration = JSON.parse(child.configuration)
|
||||
if (!configuration) {
|
||||
return
|
||||
}
|
||||
@ -378,7 +387,7 @@ export default {
|
||||
}
|
||||
})
|
||||
|
||||
let status = null;
|
||||
let status = null
|
||||
if (this.datasourceType.isPlugin) {
|
||||
status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
|
||||
} else {
|
||||
@ -387,7 +396,7 @@ export default {
|
||||
})
|
||||
}
|
||||
if (!status) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
this.$refs.dsForm.validate(valid => {
|
||||
@ -462,7 +471,7 @@ export default {
|
||||
this.$message.error(i18n.t('datasource.port_no_less_then_0'))
|
||||
return
|
||||
}
|
||||
let status = null;
|
||||
let status = null
|
||||
if (this.datasourceType.isPlugin) {
|
||||
status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
|
||||
} else {
|
||||
@ -474,7 +483,7 @@ export default {
|
||||
})
|
||||
}
|
||||
if (!status) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
this.$refs.dsForm.validate(valid => {
|
||||
if (valid) {
|
||||
@ -554,7 +563,7 @@ export default {
|
||||
}
|
||||
})
|
||||
} else {
|
||||
let index = this.form.apiConfiguration.indexOf(this.apiItem)
|
||||
const index = this.form.apiConfiguration.indexOf(this.apiItem)
|
||||
for (let i = 0; i < this.form.apiConfiguration.length; i++) {
|
||||
if (i !== index && this.form.apiConfiguration[i].name === this.apiItem.name) {
|
||||
hasRepeatName = true
|
||||
@ -652,13 +661,13 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-input {
|
||||
/* .el-input {
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
.el-select {
|
||||
width: 300px;
|
||||
}
|
||||
} */
|
||||
|
||||
.ms-http-input {
|
||||
width: 500px;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user