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
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/package.json b/data-room-ui/package.json
index 446c0e1c..a869bc10 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-2023080202-Alpha",
+ "version": "1.0.1-2023080205-Alpha",
"description": "自定义大屏",
"author": "gcpaas",
"license": "MIT",
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 {
-