From fad49bd4bf560caae3e66e8fc96feb8cf5849585 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 2 Jun 2021 17:23:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20admin=E7=94=A8=E6=88=B7=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 32a9ff2ae0..9c8ceae97f 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -187,6 +187,7 @@ export default { show: this.checkPermission(['user:edit']) }, { label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.del, + disabled: this.btnDisabled, show: this.checkPermission(['user:del']) }, { label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'success', click: this.editPassword, @@ -489,6 +490,9 @@ export default { allRoles().then(res => { this.roles = res.data }) + }, + btnDisabled(row) { + return row.userId === 1 } } } From 5b29f93eff1cb3b2701b4e1af894fb91bba1ed31 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 2 Jun 2021 17:34:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E7=A6=81=E6=AD=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9admin=E7=9A=84Id=E3=80=81=E7=8A=B6=E6=80=81=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/form.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 27d9851ed5..305c8d6fb1 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -2,7 +2,7 @@ - + @@ -27,7 +27,7 @@ - + {{ $t('commons.enable') }} {{ $t('commons.disable') }} @@ -47,6 +47,7 @@ Date: Wed, 2 Jun 2021 17:35:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(fix):=E5=89=8D=E7=AB=AF=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=EF=BC=8Cloading=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/dataset/dataset.js | 8 ++++---- .../src/views/dataset/common/DatasetGroupSelector.vue | 8 ++++---- frontend/src/views/dataset/common/DatasetTableData.vue | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 0dd77de2ba..1bf56d0bdd 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -85,10 +85,10 @@ export function getPreviewData(data) { }) } -export function fieldList(id) { +export function fieldList(id, showLoading = true) { return request({ url: '/dataset/field/list/' + id, - loading: true, + loading: showLoading, method: 'post' }) } @@ -102,11 +102,11 @@ export function batchEdit(data) { }) } -export function post(url, data) { +export function post(url, data, showLoading = true) { return request({ url: url, method: 'post', - loading: true, + loading: showLoading, data }) } diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index 2f3e06d6bc..c01814a56d 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -161,7 +161,7 @@ export default { }, 'table': function() { if (this.table && this.table.sceneId) { - post('dataset/group/getScene/' + this.table.sceneId, {}).then(response => { + post('dataset/group/getScene/' + this.table.sceneId, {}, false).then(response => { this.currGroup = response.data this.$nextTick(function() { @@ -213,7 +213,7 @@ export default { tree(group) { this.dsLoading = true - post('/dataset/group/tree', group).then(response => { + post('/dataset/group/tree', group, false).then(response => { this.data = response.data this.dsLoading = false }) @@ -227,7 +227,7 @@ export default { sort: 'type asc,create_time desc,name asc', sceneId: this.currGroup.id, mode: this.mode < 0 ? null : this.mode - }).then(response => { + }, false).then(response => { this.tables = response.data for (let i = 0; i < this.tables.length; i++) { if (this.tables[i].mode === 1 && this.kettleRunning === false) { @@ -278,7 +278,7 @@ export default { } // check mode=1的数据集是否创建doris表 if (data.mode === 1) { - post('/dataset/table/checkDorisTableIsExists/' + data.id, {}).then(response => { + post('/dataset/table/checkDorisTableIsExists/' + data.id, {}, false).then(response => { if (response.data) { this.$nextTick(function() { this.$emit('getTable', data) diff --git a/frontend/src/views/dataset/common/DatasetTableData.vue b/frontend/src/views/dataset/common/DatasetTableData.vue index 7aabcff676..e94c1ee1b0 100644 --- a/frontend/src/views/dataset/common/DatasetTableData.vue +++ b/frontend/src/views/dataset/common/DatasetTableData.vue @@ -67,7 +67,7 @@ export default { if (this.table.id) { this.dataLoading = true this.table.row = 100 - post('/dataset/table/getPreviewData/1/100', this.table).then(response => { + post('/dataset/table/getPreviewData/1/100', this.table, false).then(response => { this.fields = response.data.fields this.data = response.data.data const datas = this.data From bd15937f096b7a8ba66b6bcfd7ed21698357432f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 2 Jun 2021 17:45:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=9F=A5=E8=AF=A2=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=83=BD=E9=95=BF=E4=BC=A0=E7=A9=BA=E6=A8=A1=E6=9D=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ext/ExtPanelTemplateMapper.xml | 14 ++++++++++- .../request/panel/PanelTemplateRequest.java | 3 +++ .../service/panel/PanelTemplateService.java | 1 + frontend/src/api/system/template.js | 2 ++ frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../panel/list/EditPanel/TemplateAllList.vue | 7 ++++-- .../src/views/panel/list/EditPanel/index.vue | 24 ++++++++++++------- .../template/component/TemplateImport.vue | 8 +++++-- frontend/src/views/panel/template/index.vue | 6 ++--- 11 files changed, 51 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml index 7fd418256b..9782de83bd 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml @@ -8,6 +8,13 @@ + + panel_template.id, panel_template.`name`, panel_template.pid, panel_template.`level`, panel_template.node_type, panel_template.create_by, panel_template.create_time, panel_template.template_type + + + panel_template.snapshot, panel_template.template_style, panel_template.template_data, panel_template.dynamic_data + + SELECT - panel_template.*, + + , + + + , + panel_template.NAME AS label, ifnull(tempCountInfo.childrenCount,0) as childrenCount FROM diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java index 283931d140..c2226de6e1 100644 --- a/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java @@ -12,6 +12,8 @@ import lombok.Data; public class PanelTemplateRequest extends PanelTemplateWithBLOBs { private String sort; + private String withBlobs="Y"; + private String optType; private Boolean withChildren = false; @@ -21,5 +23,6 @@ public class PanelTemplateRequest extends PanelTemplateWithBLOBs { public PanelTemplateRequest(String pid) { super.setPid(pid); + withBlobs="N"; } } diff --git a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java index 2d56368bb8..02d2ff2775 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java @@ -39,6 +39,7 @@ public class PanelTemplateService { private ExtPanelTemplateMapper extPanelTemplateMapper; public List templateList(PanelTemplateRequest panelTemplateRequest) { + panelTemplateRequest.setWithBlobs("N"); List panelTemplateList = extPanelTemplateMapper.panelTemplateList(panelTemplateRequest); if(panelTemplateRequest.getWithChildren()){ getTreeChildren(panelTemplateList); diff --git a/frontend/src/api/system/template.js b/frontend/src/api/system/template.js index 5b83b15bcb..11c99d2f7c 100644 --- a/frontend/src/api/system/template.js +++ b/frontend/src/api/system/template.js @@ -18,6 +18,7 @@ export function showTemplateList(data) { return request({ url: '/template/templateList', data: data, + loading: true, method: 'post' }) } @@ -25,6 +26,7 @@ export function showTemplateList(data) { export function findOne(id) { return request({ url: '/template/findOne/' + id, + loading: true, method: 'get' }) } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 3339a26596..be2fd0c6f7 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -659,6 +659,7 @@ export default { rose_radius: 'Fillet', view_name: 'Chart Name', name_can_not_empty: 'Name cannot be empty', + template_can_not_empty: 'Please check a Template', custom_count: 'Number of records', table_title_fontsize: 'Font size of header', table_item_fontsize: 'Table font size', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index f6af451897..1ea23167ed 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -659,6 +659,7 @@ export default { rose_radius: '園角', view_name: '視圖名稱', name_can_not_empty: '名稱不能為空', + template_can_not_empty: '请选择仪表盘', custom_count: '記錄數', table_title_fontsize: '表頭字體大小', table_item_fontsize: '表格字體大小', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 53a80a92fd..c5f4d753b4 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -659,6 +659,7 @@ export default { rose_radius: '圆角', view_name: '视图名称', name_can_not_empty: '名称不能为空', + template_can_not_empty: '请选择仪表盘', custom_count: '记录数', table_title_fontsize: '表头字体大小', table_item_fontsize: '表格字体大小', diff --git a/frontend/src/views/panel/list/EditPanel/TemplateAllList.vue b/frontend/src/views/panel/list/EditPanel/TemplateAllList.vue index c799ce90bc..bfd345f072 100644 --- a/frontend/src/views/panel/list/EditPanel/TemplateAllList.vue +++ b/frontend/src/views/panel/list/EditPanel/TemplateAllList.vue @@ -24,7 +24,7 @@ - + @@ -39,6 +39,7 @@