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 diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 49d88101..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-2023080304-Alpha", + "version": "1.0.1-2023080403-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", 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 = { diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index b6f097f9..c8de2633 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" > - 运行并解析 + 解析并运行 @@ -298,10 +298,9 @@ :data="dataPreviewList" max-height="400" class="bs-el-table bs-scrollbar" - :border="true" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject } }, watch: { @@ -1094,7 +1101,7 @@ export default { }) }, /** - * 运行并解析数据集 + * 解析并运行数据集 */ buildParamsAndRun () { this.isTest = true @@ -1377,10 +1384,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/HttpEditForm.vue b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue index 9fde0816..385f7580 100644 --- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue @@ -455,7 +455,7 @@ type="primary" @click="scriptExecute()" > - 运行并解析 + 解析并运行 @@ -592,7 +592,6 @@ align="center" :data="dataPreviewList" max-height="400" - :border="true" class="bs-el-table" > - 运行并解析 + 解析并运行 @@ -297,7 +297,6 @@ align="center" :data="dataPreviewList" max-height="400" - :border="true" class="bs-el-table" > - 运行并解析 + 解析并运行 @@ -223,7 +223,6 @@ align="center" :data="dataPreviewList" max-height="400" - :border="true" class="bs-el-table" > {{ 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 @@ -1042,10 +1056,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 e4b53e4e..6610adb5 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" > - 运行并解析 + 解析并运行 @@ -257,11 +257,10 @@ align="center" :data="dataPreviewList" max-height="400" - :border="true" class="bs-el-table bs-scrollbar" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject + } + }, watch: { 'dataForm.script' () { this.passTest = false @@ -880,11 +889,6 @@ export default { } } -// .tree-box { -// padding: 0; -// max-height: 270px; -// } - ::v-deep .el-input__inner { width: 100% !important; } diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 4d97af6d..d40cfbdf 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" > - 运行并解析 + 解析并运行 @@ -285,11 +285,10 @@ align="center" :data="dataPreviewList" max-height="400" - :border="true" class="bs-el-table bs-scrollbar" > { + tableColumnObject[item.fieldName] = '' + }) + return tableColumnObject } }, watch: { 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('确定删除该资源？', '提示', { 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('服务异常') }) })