From 7ed7eb9e2169d8cb6116514a2ac79f308176c45f Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 11:14:26 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96axios=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/js/utils/http.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data-room-ui/packages/js/utils/http.js b/data-room-ui/packages/js/utils/http.js index 9c493d4c..e1cc9e21 100644 --- a/data-room-ui/packages/js/utils/http.js +++ b/data-room-ui/packages/js/utils/http.js @@ -210,8 +210,16 @@ export function download (url, headers = {}, params = {}, body = {}) { }).catch(e => { const status = e?.response?.status if (status === 404) { + Message({ + message: '文件不存在或已被删除', + type: 'error' + }) return } + Message({ + message: '服务异常', + type: 'error' + }) console.error('服务异常') }) }) From 06da7e32f2fac939ecb69fb590a52eb85fece252 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 11:17:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=E5=B0=86=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=AD=E7=9A=84=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E3=80=81=E6=89=A7=E8=A1=8C=E7=AD=89=E8=84=9A=E6=9C=AC=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA'=E8=A7=A3=E6=9E=90=E5=B9=B6=E8=BF=90=E8=A1=8C'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package.json | 2 +- .../packages/DataSetManagement/src/CustomEditForm.vue | 4 ++-- data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue | 2 +- data-room-ui/packages/DataSetManagement/src/JsEditForm.vue | 2 +- data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue | 2 +- .../packages/DataSetManagement/src/ScriptEditForm.vue | 2 +- .../DataSetManagement/src/StoredProcedureEditForm.vue | 2 +- data-room-ui/packages/SourceList/index.vue | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 49d88101..c12f85a7 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023080304-Alpha", + "version": "1.0.1-2023080401-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index b6f097f9..6635b7d6 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -203,7 +203,7 @@ type="primary" @click="buildParamsAndRun" > - 运行并解析 + 解析并运行 @@ -1094,7 +1094,7 @@ export default { }) }, /** - * 运行并解析数据集 + * 解析并运行数据集 */ buildParamsAndRun () { this.isTest = true diff --git a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue index 3c646cbf..945cde00 100644 --- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue @@ -454,7 +454,7 @@ type="primary" @click="scriptExecute()" > - 运行并解析 + 解析并运行 diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue index 1a801f5b..1b93a6d6 100644 --- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue @@ -165,7 +165,7 @@ type="primary" @click="scriptExecute()" > - 运行并解析 + 解析并运行 diff --git a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue index 76eab563..1dfaec13 100644 --- a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue @@ -166,7 +166,7 @@ type="primary" @click="analysisJSON" > - 运行并解析 + 解析并运行 diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue index e4b53e4e..8c4a6dab 100644 --- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue @@ -160,7 +160,7 @@ type="primary" @click="toExecute" > - 运行并解析 + 解析并运行 diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 4d97af6d..3bdf29fa 100644 --- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue @@ -190,7 +190,7 @@ type="primary" @click="buildParamsAndRun" > - 运行并解析 + 解析并运行 diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue index 6e1f16d6..8dd680ce 100644 --- a/data-room-ui/packages/SourceList/index.vue +++ b/data-room-ui/packages/SourceList/index.vue @@ -280,7 +280,7 @@ export default { window.open(screen.url, '_blank') }, downLoad (screen) { - this.$dataRoomAxios.download(`/bigScreen/file/download/${screen.id}`) + this.$dataRoomAxios.download(`/bigScreen/file/download/${screen.id}`, true) }, del (screen) { this.$confirm('确定删除该资源？', '提示', { From 379a0d8cb15c2610d89614add6a0152fe205003a Mon Sep 17 00:00:00 2001 From: "liu.chengbiao" Date: Fri, 4 Aug 2023 11:49:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9star=E5=92=8C?= =?UTF-8?q?fork=20=E4=B8=BA=E7=A0=81=E4=BA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- data-room-ui/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 12c72328..0efff838 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ 🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏目录管理、大屏设计、大屏预览能力，支持MySQL、Oracle、PostgreSQL、JSON、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。

- GitHub Repo stars - GitHub forks + stars + forks GitHub license npm Maven Central diff --git a/data-room-ui/README.md b/data-room-ui/README.md index 73da1a50..f0889d52 100644 --- a/data-room-ui/README.md +++ b/data-room-ui/README.md @@ -3,8 +3,8 @@ 🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏目录管理、大屏设计、大屏预览能力，支持MySQL、Oracle、PostgreSQL、JSON、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。

- GitHub Repo stars - GitHub forks + stars + forks GitHub license npm Maven Central From 4a9d505211f18d1256607109922686887fa59b68 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 11:52:11 +0800 Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/package.json b/data-room-ui/package.json index c12f85a7..59e4f230 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023080401-Alpha", + "version": "1.0.1-2023080402-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", From 2a8206891586251f680332b1ca18735acdc6f484 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 14:37:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?style:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=A2=84=E8=A7=88=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=8E=BB=E6=8E=89=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue | 1 - data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue | 1 - data-room-ui/packages/DataSetManagement/src/JsEditForm.vue | 1 - data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue | 1 - data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue | 1 - .../packages/DataSetManagement/src/StoredProcedureEditForm.vue | 1 - 6 files changed, 6 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index 6635b7d6..b741145a 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -298,7 +298,6 @@ :data="dataPreviewList" max-height="400" class="bs-el-table bs-scrollbar" - :border="true" > Date: Fri, 4 Aug 2023 15:34:20 +0800 Subject: [PATCH 6/9] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/DataSetManagement/src/CustomEditForm.vue | 6 ++---- .../packages/DataSetManagement/src/OriginalEditForm.vue | 6 ++---- .../packages/DataSetManagement/src/ScriptEditForm.vue | 5 ----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index b741145a..e233f588 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -1376,10 +1376,8 @@ export default { } .bs-pagination { - padding: 0 !important; - right: 16px !important; - bottom: 16px !important; - position: absolute !important; + padding: 16px !important; + position: unset !important; ::v-deep .el-input__inner { width: 110px !important; border: none; diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index b196d7a2..eb8d88f6 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -1042,10 +1042,8 @@ export default { } .bs-pagination { - padding: 0px !important; - right: 16px !important; - bottom: 16px !important; - position: absolute !important; + padding: 16px !important; + position: unset !important; ::v-deep .el-input__inner { width: 110px !important; border: none; diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue index 56284f11..7fd7ec4d 100644 --- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue @@ -879,11 +879,6 @@ export default { } } -// .tree-box { -// padding: 0; -// max-height: 270px; -// } - ::v-deep .el-input__inner { width: 100% !important; } From e642d4bf86cc25eb170e18c8437941858ccc87e6 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 15:35:48 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=AA=97=E5=8F=A3=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/ComponentList/EditForm.vue | 3 ++- data-room-ui/packages/ComponentList/index.vue | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data-room-ui/packages/ComponentList/EditForm.vue b/data-room-ui/packages/ComponentList/EditForm.vue index 818be9d3..618339d0 100644 --- a/data-room-ui/packages/ComponentList/EditForm.vue +++ b/data-room-ui/packages/ComponentList/EditForm.vue @@ -426,7 +426,8 @@ export default { code: form.code } }) - window.open(bigScreenHref, '_self') + // 新窗口打开 + window.open(bigScreenHref, '_blank') } } } diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue index e6e2667b..be543eb9 100644 --- a/data-room-ui/packages/ComponentList/index.vue +++ b/data-room-ui/packages/ComponentList/index.vue @@ -344,6 +344,7 @@ export default { window.open(href, '_blank') }, design (screen) { + console.log(222) const path = this.catalogInfo === 'component' ? (window.BS_CONFIG?.routers?.designUrl || '/big-screen/design') : (window.BS_CONFIG?.routers?.bizComponentDesignUrl || 'big-screen-biz-component-design') const { href } = this.$router.resolve({ path, @@ -351,7 +352,8 @@ export default { code: screen.code } }) - window.open(href, '_self') + // 新窗口打开 + window.open(href, '_blank') }, add () { const page = { From dc02f06ee655d1033757e4808eae0e772af9d4a8 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 16:39:54 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A9=E3=80=81=E8=84=9A=E6=9C=AC=E3=80=81?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9C=A8=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=89=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BE=9D=E6=97=A7=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=BE=93=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataSetManagement/src/CustomEditForm.vue | 10 ++++++++- .../src/OriginalEditForm.vue | 22 +++++++++++++++---- .../DataSetManagement/src/ScriptEditForm.vue | 12 +++++++++- .../src/StoredProcedureEditForm.vue | 10 ++++++++- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index e233f588..c8de2633 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -300,7 +300,7 @@ class="bs-el-table bs-scrollbar" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject } }, watch: { diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index eb8d88f6..273775c7 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -297,8 +297,9 @@ {{ field.fieldName }} ({{ - field.fieldDesc }}) + > + ({{ field.fieldDesc }}) + { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject + } + }, watch: { 'dataForm.fieldInfo': { handler (value) { @@ -588,6 +599,7 @@ export default { deep: true, immediate: true } + }, mounted () { this.init() @@ -671,9 +683,10 @@ export default { this.tableLoading = true datasetExecuteTest(executeParams).then((data) => { if (this.dataForm.fieldList == null) { - this.dataForm.fieldList = _.cloneDeep(res.structure) + this.dataForm.fieldList = _.cloneDeep(data.structure) } this.dataPreviewList = data.data.list + console.log(this.dataPreviewList) this.totalCount = data.data.totalCount this.tableLoading = false }).catch(() => { @@ -810,6 +823,7 @@ export default { */ queryAllField () { getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => { + console.log('data', data) const fieldDescMap = {} this.fieldList = data.map(field => { fieldDescMap[field.columnName] = field.columnComment diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue index 7fd7ec4d..6610adb5 100644 --- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue @@ -260,7 +260,7 @@ class="bs-el-table bs-scrollbar" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject + } + }, watch: { 'dataForm.script' () { this.passTest = false diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 76ed8272..d40cfbdf 100644 --- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue @@ -288,7 +288,7 @@ class="bs-el-table bs-scrollbar" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject } }, watch: { From a50659f819f7d6b7c53bd3a9711557be023efa05 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 4 Aug 2023 16:45:09 +0800 Subject: [PATCH 9/9] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 59e4f230..a5b1d9e2 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023080402-Alpha", + "version": "1.0.1-2023080403-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT",