From 2aacbaa9deda7ce27f2745daa9b4d7c528b81b4a Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 20 Jul 2023 10:37:13 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E4=B8=BA?= =?UTF-8?q?1.0.1.2023072001.Alpha=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=88=A0=E9=99=A4=E5=89=8D=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级数据集插件版本为1.0.1.2023072001.Alpha;添加数据集删除前检查页面引用 --- .../impl/DatasetExtendServiceImpl.java | 47 +++++++++++++++++++ DataRoom/pom.xml | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DatasetExtendServiceImpl.java diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DatasetExtendServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DatasetExtendServiceImpl.java new file mode 100644 index 00000000..2b7db783 --- /dev/null +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DatasetExtendServiceImpl.java @@ -0,0 +1,47 @@ +package com.gccloud.dataroom.core.module.manage.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gccloud.dataroom.core.module.basic.entity.PageEntity; +import com.gccloud.dataroom.core.module.manage.service.IDataRoomPageService; +import com.gccloud.dataset.extend.dataset.IDatasetExtendService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author hongyang + * @version 1.0 + * @date 2023/7/20 10:33 + */ +@Order(101) +@Service("dataroomDatasetExtendService") +public class DatasetExtendServiceImpl implements IDatasetExtendService { + + @Resource + private IDataRoomPageService pageService; + + @Override + public String deleteCheck(String id) { + if (StringUtils.isBlank(id)) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(PageEntity::getId, PageEntity::getName); + // "businessKey":"id", + queryWrapper.like(PageEntity::getConfig, "\"businessKey\":\"" + id + "\""); + queryWrapper.orderByDesc(PageEntity::getUpdateDate); + List list = pageService.list(queryWrapper); + if (list == null || list.isEmpty()) { + return null; + } + String msg = "数据集已被以下大屏页面引用,无法删除:"; + for (PageEntity page : list) { + msg += page.getName() + "、"; + } + msg = msg.substring(0, msg.length() - 1); + return msg; + } +} diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 78fc9ae9..2f271e10 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -60,7 +60,7 @@ 0.3.2 2.2 4.9.1 - 1.0.1.2023071901.Alpha + 1.0.1.2023072001.Alpha From 8692ddc9b51ffd583fb1a3ea46acc262d8b7a321 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 20 Jul 2023 10:57:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加依赖信息 --- DataRoom/dataroom-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 403621f2..ad2fd4b3 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -18,7 +18,7 @@ - + com.gccloud dataset-core From 1b8bb8910c4dd0a3442be4c528bf9f58be8bd527 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Thu, 20 Jul 2023 13:57:05 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/DataSetManagement/src/index.vue | 42 +++++++++---- .../src/checkDatasource.vue | 62 +++++++++++++++++++ .../DataSourceManagement/src/index.vue | 38 ++++++++---- .../packages/js/utils/dataSourceService.js | 11 +++- .../packages/js/utils/datasetConfigService.js | 12 +++- 5 files changed, 139 insertions(+), 26 deletions(-) create mode 100644 data-room-ui/packages/DataSourceManagement/src/checkDatasource.vue diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue index ad856ead..771d0c0a 100644 --- a/data-room-ui/packages/DataSetManagement/src/index.vue +++ b/data-room-ui/packages/DataSetManagement/src/index.vue @@ -231,6 +231,10 @@ :dataset-type-list="datasetTypeList" @openAddForm="openAddForm" /> + { - datasetRemove(id).then(res => { - this.init(false) - this.$message.success('删除成功') - }) - }).catch(() => { + datasetCheck(id).then((res)=>{ + console.log(res) + if(res.canDelete){ + this.$confirm('确定删除当前数据集吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + customClass: 'bs-el-message-box' + }).then(() => { + datasetRemove(id).then(res => { + this.init(false) + this.$message.success('删除成功') + }) + }).catch(() => { + }) + }else{ + this.reasonList=res.reasons + this.$refs.checkDatasource.checkDatasourceVisible = true + } }) + }, // 详情 toPreview (id, type, name, typeId) { diff --git a/data-room-ui/packages/DataSourceManagement/src/checkDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/checkDatasource.vue new file mode 100644 index 00000000..f1c06515 --- /dev/null +++ b/data-room-ui/packages/DataSourceManagement/src/checkDatasource.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue index e8dfacde..be67d654 100644 --- a/data-room-ui/packages/DataSourceManagement/src/index.vue +++ b/data-room-ui/packages/DataSourceManagement/src/index.vue @@ -128,14 +128,19 @@ :app-code="appCode" @refreshTable="init" /> + diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue index 5d4db73a..3e7cf581 100644 --- a/data-room-ui/packages/DataSourceManagement/src/index.vue +++ b/data-room-ui/packages/DataSourceManagement/src/index.vue @@ -128,10 +128,10 @@ :app-code="appCode" @refreshTable="init" /> - + :reason-list="reasonList" + /> @@ -185,7 +185,7 @@ export default { }, data () { return { - reasonList:[], + reasonList: [], testBtnLoading: [], loadingText: '', searchLoading: false, @@ -279,25 +279,24 @@ export default { handleDelete (row) { // eslint-disable-next-line eqeqeq if (row.editable == 1 && !this.appCode) return - dataSourceCheck(row.id).then((res)=>{ - if(res.canDelete){ + dataSourceCheck(row.id).then((res) => { + if (res.canDelete) { this.$confirm('确定删除当前数据源吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - customClass: 'bs-el-message-box' - }).then(() => { - sourceRemove(row.id).then((r) => { - this.$message.success('删除成功') - this.init() + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + customClass: 'bs-el-message-box' + }).then(() => { + sourceRemove(row.id).then((r) => { + this.$message.success('删除成功') + this.init() + }) }) - }) - }else{ - this.reasonList=res.reasons + } else { + this.reasonList = res.reasons this.$refs.checkDatasource.checkDatasourceVisible = true } }) - }, sourceLinkTest (row) { this.testBtnLoading.push(row.id) From 8c838b03fd6b034e0851ba17a66401c5a01e2fc0 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 20 Jul 2023 17:39:57 +0800 Subject: [PATCH 07/11] =?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 679e1b98..33a01d86 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-2023071901-Alpha", + "version": "1.0.1-2023072001-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", From a7c151d2b10309b8b4c4e8b60551df262eef628d Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 20 Jul 2023 17:50:02 +0800 Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88=E6=9C=AC1.0.1.2023072001.Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发布测试版本1.0.1.2023072001.Alpha --- DataRoom/dataroom-core/pom.xml | 2 +- DataRoom/dataroom-server/pom.xml | 4 ++-- DataRoom/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index ad2fd4b3..a5184be5 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 1.0.1.2023071901.Alpha + 1.0.1.2023072001.Alpha dataroom-core diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index bbf98318..8ed319cb 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 1.0.1.2023071901.Alpha + 1.0.1.2023072001.Alpha dataroom-server @@ -22,7 +22,7 @@ com.gccloud dataroom-core - 1.0.1.2023071901.Alpha + 1.0.1.2023072001.Alpha io.springfox diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 2f271e10..2803b79f 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -12,7 +12,7 @@ com.gccloud dataroom - 1.0.1.2023071901.Alpha + 1.0.1.2023072001.Alpha pom 基于G2Plot、Echarts的大屏设计服务端,具备设计、预览能力,支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入 From 9d2d794448c70fc6b299fdbdacfb05312d2fb326 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Thu, 20 Jul 2023 17:53:36 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat:=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/DataSetManagement/src/index.vue | 15 ++++++++++----- .../packages/DataSourceManagement/src/index.vue | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue index 771d0c0a..97706d63 100644 --- a/data-room-ui/packages/DataSetManagement/src/index.vue +++ b/data-room-ui/packages/DataSetManagement/src/index.vue @@ -198,8 +198,9 @@ 删除 @@ -445,9 +446,10 @@ export default { this.curRow = currentRow }, // 删除数据集 - delDataset (id) { - datasetCheck(id).then((res)=>{ - console.log(res) + delDataset (row) { + row.loading=true + datasetCheck(row.id).then((res)=>{ + row.loading=false if(res.canDelete){ this.$confirm('确定删除当前数据集吗?', '提示', { confirmButtonText: '确定', @@ -455,7 +457,7 @@ export default { type: 'warning', customClass: 'bs-el-message-box' }).then(() => { - datasetRemove(id).then(res => { + datasetRemove(row.id).then(res => { this.init(false) this.$message.success('删除成功') }) @@ -575,6 +577,9 @@ export default { datasetType: this.queryForm.datasetType === '' ? [...this.allType] : [this.queryForm.datasetType] }).then((data) => { this.tableData = data.list + this.tableData.forEach(r => { + this.$set(r, 'loading', false) + }) if (this.isDialog) { if (this.multiple && this.multipleSelection.length) { this.toggleRowSelection() diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue index 5d4db73a..0464843d 100644 --- a/data-room-ui/packages/DataSourceManagement/src/index.vue +++ b/data-room-ui/packages/DataSourceManagement/src/index.vue @@ -96,6 +96,7 @@ @@ -188,6 +189,7 @@ export default { reasonList:[], testBtnLoading: [], loadingText: '', + deling:false, searchLoading: false, dataSourceList: [], searchForm: { @@ -255,6 +257,7 @@ export default { this.dataSourceList = data.list this.dataSourceList.forEach(r => { r.status = 0 + this.$set(r, 'loading', false) if (r.id === this.sourceId) { this.curRow = r } @@ -279,7 +282,9 @@ export default { handleDelete (row) { // eslint-disable-next-line eqeqeq if (row.editable == 1 && !this.appCode) return + row.loading=true dataSourceCheck(row.id).then((res)=>{ + row.loading=false if(res.canDelete){ this.$confirm('确定删除当前数据源吗?', '提示', { confirmButtonText: '确定', From 9c2051100a90d15430094deffec8206d05618630 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 20 Jul 2023 22:13:15 +0800 Subject: [PATCH 10/11] =?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 33a01d86..1a0335fe 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-2023072001-Alpha", + "version": "1.0.1-2023072003-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", From 8acf6342a4e7cd4437485dab1b13b21478063df4 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 21 Jul 2023 17:24:46 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8vue=E5=8E=9F?= =?UTF-8?q?=E5=9E=8B=E9=93=BE=E4=B8=8A=E7=9A=84axios=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package-lock.json | 100 +++--- data-room-ui/package.json | 2 +- .../packages/BasicComponents/Map/index.vue | 16 +- .../packages/BasicComponents/Map/setting.vue | 5 +- .../BasicComponents/TimeCountDown/setting.vue | 1 + .../BigScreenDesign/ComponentDialog/index.vue | 340 +++++++++++++----- .../OverallSetting/BgImgDialog.vue | 1 - .../BigScreenDesign/SourceDialog/index.vue | 154 ++++++-- .../packages/BigScreenManagement/index.vue | 2 - data-room-ui/packages/BigScreenRun/index.vue | 1 - .../packages/assets/style/bsTheme.scss | 4 +- 11 files changed, 432 insertions(+), 194 deletions(-) diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json index 2d72e0aa..2b38108a 100644 --- a/data-room-ui/package-lock.json +++ b/data-room-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023071901-Alpha", + "version": "1.0.1-2023072003-Alpha", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2445,11 +2445,6 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, - "@popperjs/core": { - "version": "npm:@sxzz/popperjs-es@2.11.7", - "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", - "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" - }, "@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz", @@ -3351,27 +3346,6 @@ "whatwg-fetch": "^3.6.2" }, "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", - "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -3443,26 +3417,6 @@ "tapable": "^2.0.0" } }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", @@ -3779,6 +3733,47 @@ "lodash": "^4.17.4" } }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", + "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "@vue/vue2-jest": { "version": "27.0.0", "resolved": "https://registry.npmmirror.com/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz", @@ -3993,9 +3988,9 @@ } }, "@wjjj/utils": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@wjjj/utils/-/utils-0.1.2.tgz", - "integrity": "sha512-ha0TIHwBYvvfOxMdeKyr0odWB12Tdv+C2kGUepDh74Ktm6uR5vq25QmMYNt6nMN/bH3KuPH82ynlDvfK+slZfg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@wjjj/utils/-/utils-0.1.5.tgz", + "integrity": "sha512-TW2m6BXUuP089GBB8BAHpeb+eJoRpMzhiGt1gUibvCQUwze7Coamlio1rHkTnBaRGs0JLhE6ToTMrjqJowfNgQ==", "requires": { "element-plus": "^2.3.8", "npm": "^9.8.0", @@ -7737,6 +7732,11 @@ "normalize-wheel-es": "^1.2.0" }, "dependencies": { + "@popperjs/core": { + "version": "npm:@sxzz/popperjs-es@2.11.7", + "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", + "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" + }, "async-validator": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz", diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 1a0335fe..694c9788 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -53,7 +53,7 @@ "@amap/amap-jsapi-loader": "^1.0.1", "@antv/g2plot": "2.4.0", "@jiaminghi/data-view": "2.10.0", - "@wjjj/utils": "^0.1.2", + "@wjjj/utils": "^0.1.5", "axios": "0.18.1", "babel-polyfill": "6.26.0", "echarts": "^5.2.2", diff --git a/data-room-ui/packages/BasicComponents/Map/index.vue b/data-room-ui/packages/BasicComponents/Map/index.vue index 8132c2ec..dddb8911 100644 --- a/data-room-ui/packages/BasicComponents/Map/index.vue +++ b/data-room-ui/packages/BasicComponents/Map/index.vue @@ -15,7 +15,6 @@ import * as echarts from 'echarts' import commonMixins from 'data-room-ui/js/mixins/commonMixins.js' import paramsMixins from 'data-room-ui/js/mixins/paramsMixins' import linkageMixins from 'data-room-ui/js/mixins/linkageMixins' -import { get } from 'data-room-ui/js/utils/http' export default { name: 'MapCharts', mixins: [paramsMixins, commonMixins, linkageMixins], @@ -60,7 +59,7 @@ export default { }, methods: { chartInit () { - let config = this.config + const config = this.config // key和code相等,说明是一进来刷新,调用list接口 if (this.config.code === this.config.key || this.isPreview) { // 改变数据 @@ -255,20 +254,9 @@ export default { } } const mapUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/chinaMap/${config.customize.level}/${config.customize.dataMap}` - const map = await get(decodeURI(mapUrl), {}, true) + const map = await this.$dataRoomAxios.get(decodeURI(mapUrl), {}, true) echarts.registerMap(config.customize.scope, map) this.charts.setOption(option) - // this.charts.on('click', (params) => { - // get( - // `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/chinaMap/province/${params.name}.json`, - // {}, - // true - // ).then((res) => { - // option.geo.map = params.name - // echarts.registerMap(params.name, res) - // this.charts.setOption(option, true) - // }) - // }) } } } diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 52e955f4..fee28050 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -227,7 +227,6 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins' import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue' -import { get } from 'data-room-ui/js/utils/http' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' export default { name: 'BarSetting', @@ -271,9 +270,7 @@ export default { }, methods: { getMapList () { - get( - `${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/design/map/list/${this.config.customize.level}` - ).then((res) => { + this.$dataRoomAxios.get(`${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/design/map/list/${this.config.customize.level}`).then((res) => { this.mapList = res }) }, diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue index 2fef7e7b..8199efec 100644 --- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue @@ -66,6 +66,7 @@ > - +
- +
- - - + + + - + 搜索
-
+ }" + > -
-
+
+
- -
+ +
加载中···
-
+
{{ screen.name }}
@@ -39,55 +98,122 @@
-
+
{{ screen.name }}
-
+
暂无数据
- +
- - - + + + - + 搜索
-
+ }" + > -
-
+
+
- -
+ +
加载中···
-
+
{{ screen.name }}
@@ -95,68 +221,123 @@
-
+
{{ screen.name }}
-
+
暂无数据
- +
-
-
-
+ }" + > +
+
- -
+ +
加载中···
-
+
{{ component.title }}
-
+
暂无数据
-