From ae9c6a453a5c910df54d27b97e6cd9a6ae8b0a9a Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Mon, 24 Jul 2023 16:05:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9B=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E5=AE=9A=E4=B9=89=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/example/main.js | 1 + .../packages/DataSetManagement/src/OriginalEditForm.vue | 2 +- data-room-ui/packages/DataSetManagement/src/index.vue | 8 ++------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data-room-ui/example/main.js b/data-room-ui/example/main.js index acc4c5b4..c566d664 100644 --- a/data-room-ui/example/main.js +++ b/data-room-ui/example/main.js @@ -51,6 +51,7 @@ registerConfig( '--bs-el-color-primary-active': '64, 158, 255', // 主要激活 => rgba(64, 158, 255, 1) = #409EFF '--bs-el-border': 'transparent' // 边框颜色 }, + // datasetTypeList: ['original','custom'], customPlots: [], // 远程组件列表 remoteComponents, diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index 27620dcb..b19a0903 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -50,7 +50,7 @@ [] - }, appCode: { type: String, default: '' @@ -535,8 +531,8 @@ export default { { name: '脚本数据集', datasetType: 'script', componentName: 'ScriptEditForm' }, { name: 'JS数据集', datasetType: 'js', componentName: 'JsEditForm' } ] - if (this.dataSetList.length !== 0) { - this.datasetTypeList = [{ name: '全部', datasetType: '' }, ...list.filter(item => this.dataSetList.findIndex(x => x === item.datasetType) !== -1)] + if (window.BS_CONFIG?.datasetTypeList&&window.BS_CONFIG?.datasetTypeList?.length!=0) { + this.datasetTypeList = [{ name: '全部', datasetType: '' }, ...list.filter(item => window.BS_CONFIG?.datasetTypeList.findIndex(x => x === item.datasetType) !== -1)] } else { this.datasetTypeList = [ ...list