diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js index c58409d9cc..be854d84bd 100644 --- a/frontend/src/api/chart/chart.js +++ b/frontend/src/api/chart/chart.js @@ -152,3 +152,30 @@ export const viewOptions = panelId => { method: 'post' }) } + + +export function getDatasourceRelationship(id) { + return request({ + url: `/api/relation/datasource/${id}`, + method: 'get', + loading: true + }) +} + + +export function getDatasetRelationship(id) { + return request({ + url: `/api/relation/dataset/${id}`, + method: 'get', + loading: true + }) +} + + +export function getPanelRelationship(id) { + return request({ + url: `/api/relation/panel/${id}`, + method: 'get', + loading: true + }) +} diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index a7ec14dc6a..a194700c45 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -86,6 +86,23 @@ export function listDatasource() { }) } +export function getDatasetList() { + return request({ + url: 'dataset/table/list', + loading: false, + method: 'post', + data: {} + }) +} + +export function getPanelGroupList() { + return request({ + url: '/panel/group/list', + loading: false, + method: 'get' + }) +} + export function listApiDatasource() { return request({ url: '/datasource/list/api', diff --git a/frontend/src/components/dataease/DeAsideContainer.vue b/frontend/src/components/dataease/DeAsideContainer.vue index c2eb6074ea..4a76dff7df 100644 --- a/frontend/src/components/dataease/DeAsideContainer.vue +++ b/frontend/src/components/dataease/DeAsideContainer.vue @@ -46,17 +46,26 @@ export default { }, data() { return { - asideHidden: false + asideHidden: false, + currentWidth: '', } }, computed: { - currentWidth() { - return this.isCollapseWidth || this.type && getLayout(this.type) || this.width - }, isSystem() { // 系统管理不需要拖拽菜单 return this.isTemplate || (!this.$route.fullPath.includes('system') && this.showDragBar) } + }, + mounted() { + this.setCurrentWidth() + }, + beforeUpdate() { + this.setCurrentWidth() + }, + methods: { + setCurrentWidth() { + this.currentWidth = this.isCollapseWidth || this.type && getLayout(this.type) || this.width + } } } diff --git a/frontend/src/components/deCustomCm/DeTextarea.vue b/frontend/src/components/deCustomCm/DeTextarea.vue index b624d7eea6..ca2b255469 100644 --- a/frontend/src/components/deCustomCm/DeTextarea.vue +++ b/frontend/src/components/deCustomCm/DeTextarea.vue @@ -17,7 +17,10 @@ export default { count: { update: function(el, binding) { const { value, maxlength, buttonDisabled } = binding.value - if (buttonDisabled) return + if (buttonDisabled) { + el.removeChild(el.querySelector('.el-input__count')) + return + } const lg = value?.length || 0 const count = el.querySelector('.el-input__count') if (!count) return diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 96c9b23c63..af97fd524f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -135,6 +135,7 @@ export default { default_login: 'Normal' }, commons: { + consanguinity: 'Consanguinity', collapse_navigation: 'Collapse navigation', operate_cancelled: 'Operation cancelled', bind: 'Bind', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 71b5d50f4a..7e35b8d5a1 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -135,6 +135,7 @@ export default { default_login: '普通登錄' }, commons: { + consanguinity: '血緣關係', collapse_navigation: '收起導航', operate_cancelled: '已取消操作', bind: '綁定', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 900b91a444..c48403deaa 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -135,6 +135,7 @@ export default { default_login: '普通登录' }, commons: { + consanguinity: '血缘关系', collapse_navigation: '收起导航', operate_cancelled: '已取消操作', bind: '绑定', diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index f852311969..071fb3774d 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -554,7 +554,7 @@ export default { } &.active { - background-color: var(--deWhiteHover, #3370ff); + background-color: var(--deWhiteHover, #e0eaff); color: var(--primary, #3370ff); } diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 61dbe828fc..6f747ac1c7 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -37,6 +37,7 @@ @@ -49,7 +50,6 @@ size="small" > @@ -66,10 +67,11 @@ :ref="`apiTable${api.name}`" placement="top" width="200" + :disabled="disabled" popper-class="api-table-delete" trigger="click" > - +
{{ $t('datasource.delete_this_item') }}
@@ -1140,6 +1142,9 @@ export default { } }, copyItem(item) { + if (this.disabled) { + return + } var newItem = JSON.parse(JSON.stringify(item)) newItem.serialNumber = this.form.apiConfiguration[this.form.apiConfiguration.length - 1] diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue index 8bfc71907f..ed5ade745e 100644 --- a/frontend/src/views/system/datasource/DsFormContent.vue +++ b/frontend/src/views/system/datasource/DsFormContent.vue @@ -660,8 +660,9 @@ export default { }) }, methods: { - editDatasource() { - this.disabled = false + editDatasource(type) { + this.canEdit = type + this.disabled = !type }, baseInfoDisabledCheck(privileges) { return !(this.formType === 'add' ? true : hasDataPermission('manage', privileges)) @@ -1190,7 +1191,7 @@ export default { } }, backToList() { - this.$router.push('/datasource/index') + this.$emit('editeTodisable', false) }, closeDraw() { diff --git a/frontend/src/views/system/datasource/DsTable.vue b/frontend/src/views/system/datasource/DsTable.vue index e9d19132e7..713c8db260 100644 --- a/frontend/src/views/system/datasource/DsTable.vue +++ b/frontend/src/views/system/datasource/DsTable.vue @@ -21,9 +21,15 @@