From b9e0adec20aeb91da4f6d3ca1dc03a24820e0ab9 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 2 Aug 2023 15:58:12 +0800 Subject: [PATCH 1/4] =?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=E5=88=B0?= =?UTF-8?q?1.0.1.2023080201.Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级数据集插件版本到1.0.1.2023080201.Alpha --- .../module/manage/service/impl/DatasetExtendServiceImpl.java | 5 +++++ DataRoom/pom.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 index 2b7db783..60efc03b 100644 --- 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 @@ -44,4 +44,9 @@ public class DatasetExtendServiceImpl implements IDatasetExtendService { msg = msg.substring(0, msg.length() - 1); return msg; } + + @Override + public String getServiceType() { + return "大屏"; + } } diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 6aef891c..d031ac60 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -60,7 +60,7 @@ 0.3.2 2.2 4.9.1 - 1.0.1.2023080101.Alpha + 1.0.1.2023080201.Alpha From 88dd17be628a3098ae2b42177ad53dadee5a54a4 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 2 Aug 2023 16:11:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?style:=20=E7=BB=9F=E4=B8=80el-radio-group?= =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=B7=B1=E8=89=B2=E4=B8=BB=E9=A2=98=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package-lock.json | 84 +++++++++---------- .../BigScreenDesign/BorderSetting.vue | 6 +- .../BigScreenDesign/OverallSetting/index.vue | 1 - .../RightSetting/DataSetting.vue | 2 +- .../RightSetting/G2CustomSetting.vue | 1 + .../RightSetting/TextGradient/index.vue | 2 +- .../DataSetManagement/src/CustomEditForm.vue | 5 +- .../DataSetManagement/src/HttpEditForm.vue | 2 +- .../src/JsComponents/ParamsSettingDialog.vue | 5 +- .../src/OriginalEditForm.vue | 9 +- .../DataSetManagement/src/ScriptEditForm.vue | 1 + .../src/StoredProcedureEditForm.vue | 5 +- .../packages/assets/style/bsTheme.scss | 13 ++- .../packages/assets/style/settingWrap.scss | 1 - 14 files changed, 77 insertions(+), 60 deletions(-) diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json index 8f45ac5b..d44dc85f 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-2023072503-Alpha", + "version": "1.0.1-2023080204-Alpha", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3397,27 +3397,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.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -3489,26 +3468,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.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3726,6 +3685,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.npmjs.org/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz", diff --git a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue index 82757b2a..090315d1 100644 --- a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue @@ -45,7 +45,10 @@ /> - + 纯色 @@ -194,6 +197,7 @@ export default { -