From 64958d398e7d4b07c63a33e888589264db3d785c Mon Sep 17 00:00:00 2001 From: jingna <1264204245@qq.com> Date: Fri, 18 Apr 2025 18:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/newimg/dataset.png | Bin 0 -> 550 bytes .../src/assets/newimg/editpro.png | Bin 0 -> 432 bytes .../src/assets/newimg/icon/dataset.png | Bin 0 -> 550 bytes .../src/assets/newimg/icon/editpro.png | Bin 0 -> 432 bytes .../src/assets/svg/combinationpage.svg | 6 ++++ .../src/assets/svg/scatterpage.svg | 6 ++++ .../components/editor/filter/FilterTree.vue | 2 +- .../filter/auth-tree-chart/AuthTree.vue | 28 +++++++++++------- .../src/viewsnew/application/index.vue | 5 ++-- .../application/service/dataset/index.vue | 27 ++++++++++++----- 10 files changed, 54 insertions(+), 20 deletions(-) create mode 100644 core/core-frontend/src/assets/newimg/dataset.png create mode 100644 core/core-frontend/src/assets/newimg/editpro.png create mode 100644 core/core-frontend/src/assets/newimg/icon/dataset.png create mode 100644 core/core-frontend/src/assets/newimg/icon/editpro.png create mode 100644 core/core-frontend/src/assets/svg/combinationpage.svg create mode 100644 core/core-frontend/src/assets/svg/scatterpage.svg diff --git a/core/core-frontend/src/assets/newimg/dataset.png b/core/core-frontend/src/assets/newimg/dataset.png new file mode 100644 index 0000000000000000000000000000000000000000..c22b9c5b349b0f524e35daaa7be459549b9c8a24 GIT binary patch literal 550 zcmV+>0@?kEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lP^=K~y+Tjgmi0 zLQxop?-d6J2O$Fo2LlHKhlU1+1_uMT8X5{38u|bQ4nhrrA0VQkp(QA2aEg|opush0 zC@9FSmM}2aKr)Wz;mAxr`fw8T>`4z_K+V`EWwLguREf74!iolGjkjU4f!&!WN(r z_Vi^@6>@F|I=jww0K>;P!(_01(3wl1muT;R+^xQ@zg`jRxtj1}Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YynfK~y+Tjglcx zLqQOPdr3t_1rmX*Kp+u_N(@N_;t2$@KLClZKq3&3ASw_DM1KI1x{8t@5HtaYL?9|k z-s79g^itp+Fv(R{}zQuJE=0LN63-}7tPsRD%=8-<;@>kI8!DvR5_9H*BIlaXX(A0@?kEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lP^=K~y+Tjgmi0 zLQxop?-d6J2O$Fo2LlHKhlU1+1_uMT8X5{38u|bQ4nhrrA0VQkp(QA2aEg|opush0 zC@9FSmM}2aKr)Wz;mAxr`fw8T>`4z_K+V`EWwLguREf74!iolGjkjU4f!&!WN(r z_Vi^@6>@F|I=jww0K>;P!(_01(3wl1muT;R+^xQ@zg`jRxtj1}Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YynfK~y+Tjglcx zLqQOPdr3t_1rmX*Kp+u_N(@N_;t2$@KLClZKq3&3ASw_DM1KI1x{8t@5HtaYL?9|k z-s79g^itp+Fv(R{}zQuJE=0LN63-}7tPsRD%=8-<;@>kI8!DvR5_9H*BIlaXX(A + + + + + \ No newline at end of file diff --git a/core/core-frontend/src/assets/svg/scatterpage.svg b/core/core-frontend/src/assets/svg/scatterpage.svg new file mode 100644 index 0000000..2f13374 --- /dev/null +++ b/core/core-frontend/src/assets/svg/scatterpage.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue index b8ab3b9..b89920c 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue @@ -95,7 +95,7 @@ defineExpose({ diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue index d8acd24..9440381 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue @@ -90,7 +90,7 @@ const del = (index, child) => { {{ logic === 'or' ? 'OR' : 'AND' }} - + {{ logic === 'or' ? 'OR' : 'AND' }} @@ -250,22 +250,30 @@ const del = (index, child) => { } .ed-dropdown__popper .ed-dropdown-menu{ - background-color: #303133; - border: 1px solid #434343; + background-color: rgba(41, 41, 41, 1); + border: none; } :deep(.ed-dropdown-menu__item) { color: #F2F4F5; } +:deep(.ed-popper.is-light){ + border:1px solid #434343; + background: rgba(41, 41, 41, 1); +} +:deep(.ed-dropdown__popper.ed-popper){ + border-color: rgba(70, 70, 70, 1); +} +:deep(.ed-dropdown-menu__item:not(.is-disabled):hover){ + background-color: rgba(61,61,61, 1); +} \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue index fa9b1aa..bda0945 100644 --- a/core/core-frontend/src/viewsnew/application/index.vue +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -105,9 +105,9 @@ function delClick(row){
- + - + @@ -140,6 +140,7 @@ function delClick(row){ padding: 20px ; padding-left: 40px ; padding-right: 0px ; + background-color: rgb(21,21,21); } .keywordsClass{ width: 403px; diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue index cc7556c..547f4ad 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue @@ -651,7 +651,7 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => { creatDsFolder.value.createInit(nodeType, data, cmd) } } - +const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) const handleDatasetTree = (cmd: string, data?: BusiTreeNode) => { data.appId = applicationId.value if (cmd === 'dataset') { @@ -981,18 +981,18 @@ const proxyAllowDrop = debounce((arg1, arg2) => { /> {{ t('data_set.new_data_screen') }} --> - -