diff --git a/data-room-ui/example/main.js b/data-room-ui/example/main.js index e74c0a77..e8992fcc 100644 --- a/data-room-ui/example/main.js +++ b/data-room-ui/example/main.js @@ -40,7 +40,9 @@ registerConfig( componentUrl: '/big-screen-components' }, httpConfigs: { - baseURL: window.CONFIG?.baseUrl + baseURL: window.CONFIG?.baseUrl, + // 现在文件路径保存的是相对路径，所以需要加上前缀,这个值一般和后端的gc.starter.file.urlPrefix一致 + fileUrlPrefix: window.CONFIG.fileUrlPrefix ? window.CONFIG.fileUrlPrefix : window.CONFIG?.baseUrl + '/static', }, customTheme: { '--bs-background-1': '#151a26', // 整体背景色 diff --git a/data-room-ui/packages/BasicComponents/FlyMap/index.vue b/data-room-ui/packages/BasicComponents/FlyMap/index.vue index 4e2113bf..71235bd9 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/index.vue +++ b/data-room-ui/packages/BasicComponents/FlyMap/index.vue @@ -117,7 +117,7 @@ export default { let mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/map/info/${config.customize.mapId}` // 如果设置了地图id，就用地图id获取地图数据，否则用默认的世界地图 if (!hasMapId) { - mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/worldMap/world.json` + mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.fileUrlPrefix}/worldMap/world.json` } this.$dataRoomAxios.get(mapInfoUrl, {}, true).then(res => { if (this.config.option.data) { diff --git a/data-room-ui/packages/BasicComponents/Map/index.vue b/data-room-ui/packages/BasicComponents/Map/index.vue index fc1b70d4..985940fb 100644 --- a/data-room-ui/packages/BasicComponents/Map/index.vue +++ b/data-room-ui/packages/BasicComponents/Map/index.vue @@ -289,7 +289,7 @@ export default { let mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/map/info/${config.customize.mapId}` // 如果设置了地图id，就用地图id获取地图数据，否则用默认的世界地图 if (!hasMapId) { - mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/chinaMap/country/中华人民共和国.json` + mapInfoUrl = `${window.BS_CONFIG?.httpConfigs?.fileUrlPrefix}/chinaMap/country/中华人民共和国.json` } const mapResp = await this.$dataRoomAxios.get(decodeURI(mapInfoUrl), {}, true) const map = hasMapId ? JSON.parse(mapResp.data.geoJson) : mapResp diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 040ad3f7..ca805f03 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -445,7 +445,7 @@ export default { .lc-field-body { padding: 12px 16px; } -/deep/.bs-el-slider-dark { +::v-deep.bs-el-slider-dark { .el-slider__runway { background-color: var(--bs-el-background-1) !important; diff --git a/data-room-ui/packages/BasicComponents/Picture/index.vue b/data-room-ui/packages/BasicComponents/Picture/index.vue index ff449734..d2f48fd7 100644 --- a/data-room-ui/packages/BasicComponents/Picture/index.vue +++ b/data-room-ui/packages/BasicComponents/Picture/index.vue @@ -2,7 +2,7 @@
@@ -122,6 +122,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' +import { getFileUrl } from 'data-room-ui/js/utils/file' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' export default { name: 'PicSetting', @@ -146,22 +147,22 @@ export default { hideUpload: false, rules: { 'customize.url': [ - // 地址校验 - { - validator: (rule, value, callback) => { - if (value) { - const reg = /^(http|https):\/\/([\w.]+\/?)\S*/ - if (!reg.test(value)) { - callback(new Error('请输入正确的URL地址')) - } else { - callback() - } - } else { - callback() - } - }, - trigger: 'blur' - } + // 地址校验 NOTE 暂时移除校验，因为通过系统上传的图片，url是相对路径，无法通过校验 + // { + // validator: (rule, value, callback) => { + // if (value) { + // const reg = /^(http|https):\/\/([\w.]+\/?)\S*/ + // if (!reg.test(value)) { + // callback(new Error('请输入正确的URL地址')) + // } else { + // callback() + // } + // } else { + // callback() + // } + // }, + // trigger: 'blur' + // } ] } } @@ -230,7 +231,15 @@ export default { this.$message.error('上传图片大小不能超过 2MB!') } return isLt2M - } + }, + /** + * 获取图片访问地址,如果是相对路径则拼接上文件访问前缀地址 + * @param url + * @returns {*} + */ + getCoverPicture (url) { + return getFileUrl(url) + }, } } diff --git a/data-room-ui/packages/BigScreenList/index.vue b/data-room-ui/packages/BigScreenList/index.vue index 3c39d934..53751203 100644 --- a/data-room-ui/packages/BigScreenList/index.vue +++ b/data-room-ui/packages/BigScreenList/index.vue @@ -93,7 +93,7 @@
@@ -156,6 +156,7 @@ diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue index 5ec6d3b8..ca7fcdc4 100644 --- a/data-room-ui/packages/ComponentList/index.vue +++ b/data-room-ui/packages/ComponentList/index.vue @@ -122,7 +122,7 @@
@@ -196,6 +196,7 @@ diff --git a/data-room-ui/packages/SourceList/images/audio.svg b/data-room-ui/packages/SourceList/images/audio.svg new file mode 100644 index 00000000..97b51ba1 --- /dev/null +++ b/data-room-ui/packages/SourceList/images/audio.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/defaultImg.png b/data-room-ui/packages/SourceList/images/defaultImg.png deleted file mode 100644 index d3a4db85..00000000 Binary files a/data-room-ui/packages/SourceList/images/defaultImg.png and /dev/null differ diff --git a/data-room-ui/packages/SourceList/images/excel.svg b/data-room-ui/packages/SourceList/images/excel.svg new file mode 100644 index 00000000..04107cdc --- /dev/null +++ b/data-room-ui/packages/SourceList/images/excel.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/pdf.svg b/data-room-ui/packages/SourceList/images/pdf.svg new file mode 100644 index 00000000..1683746f --- /dev/null +++ b/data-room-ui/packages/SourceList/images/pdf.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/ppt.svg b/data-room-ui/packages/SourceList/images/ppt.svg new file mode 100644 index 00000000..19dd201c --- /dev/null +++ b/data-room-ui/packages/SourceList/images/ppt.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/unknown.svg b/data-room-ui/packages/SourceList/images/unknown.svg new file mode 100644 index 00000000..b9022091 --- /dev/null +++ b/data-room-ui/packages/SourceList/images/unknown.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/video.svg b/data-room-ui/packages/SourceList/images/video.svg new file mode 100644 index 00000000..ca906cf1 --- /dev/null +++ b/data-room-ui/packages/SourceList/images/video.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/word.svg b/data-room-ui/packages/SourceList/images/word.svg new file mode 100644 index 00000000..eb695eb5 --- /dev/null +++ b/data-room-ui/packages/SourceList/images/word.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/images/zip.svg b/data-room-ui/packages/SourceList/images/zip.svg new file mode 100644 index 00000000..13d5ab32 --- /dev/null +++ b/data-room-ui/packages/SourceList/images/zip.svg @@ -0,0 +1 @@ + diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue index eb275749..56b88322 100644 --- a/data-room-ui/packages/SourceList/index.vue +++ b/data-room-ui/packages/SourceList/index.vue @@ -5,18 +5,18 @@
@@ -103,9 +102,23 @@
-
+
+
+ 加载中··· +
+ +
+
+ @@ -119,8 +132,8 @@
{{ screen.originalName }}
@@ -141,16 +154,16 @@
-->
@@ -166,8 +179,10 @@
diff --git a/data-room-ui/packages/js/utils/file.js b/data-room-ui/packages/js/utils/file.js new file mode 100644 index 00000000..197ee328 --- /dev/null +++ b/data-room-ui/packages/js/utils/file.js @@ -0,0 +1,20 @@ +function getFileUrl(url){ + // 如果是空的直接返回 + if (!url) { + return url + } + // 如果是http开头的直接返回 + if (/^http/.test(url)) { + return url + } + // 如果没有以/开头的加上/ + if (!/^\//.test(url)) { + url = `/${url}` + } + return `${window.BS_CONFIG?.httpConfigs?.fileUrlPrefix}${url}` +} + + +export { + getFileUrl +} diff --git a/data-room-ui/public/config/index-development.js b/data-room-ui/public/config/index-development.js index 87f4c10c..800224a4 100644 --- a/data-room-ui/public/config/index-development.js +++ b/data-room-ui/public/config/index-development.js @@ -1,6 +1,7 @@ window.ENV = 'development' var developmentConfig = { - baseUrl: 'http://127.0.0.1:8081/bigScreenServer' + baseUrl: 'http://127.0.0.1:8081/bigScreenServer', + fileUrlPrefix: 'http://127.0.0.1:8081/bigScreenServer' + '/static' } // 必须的 window.CONFIG = configDeepMerge(window.CONFIG, developmentConfig) diff --git a/data-room-ui/public/config/index-production.js b/data-room-ui/public/config/index-production.js index ba69401e..8b6e954a 100644 --- a/data-room-ui/public/config/index-production.js +++ b/data-room-ui/public/config/index-production.js @@ -1,6 +1,8 @@ window.ENV = 'production' var productionConfig = { - baseUrl: 'http://gcpaas.gccloud.com/bigScreenServer' + baseUrl: 'http://gcpaas.gccloud.com/bigScreenServer', + fileUrlPrefix: 'http://gcpaas.gccloud.com/bigScreenServer' + '/static' + } // 必须的 window.CONFIG = configDeepMerge(window.CONFIG, productionConfig)