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 0000000..c22b9c5 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/dataset.png differ diff --git a/core/core-frontend/src/assets/newimg/editpro.png b/core/core-frontend/src/assets/newimg/editpro.png new file mode 100644 index 0000000..30f26f6 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/editpro.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/dataset.png b/core/core-frontend/src/assets/newimg/icon/dataset.png new file mode 100644 index 0000000..c22b9c5 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/dataset.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/editpro.png b/core/core-frontend/src/assets/newimg/icon/editpro.png new file mode 100644 index 0000000..30f26f6 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/editpro.png differ diff --git a/core/core-frontend/src/assets/svg/combinationpage.svg b/core/core-frontend/src/assets/svg/combinationpage.svg new file mode 100644 index 0000000..035f735 --- /dev/null +++ b/core/core-frontend/src/assets/svg/combinationpage.svg @@ -0,0 +1,6 @@ + + + + + + \ 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') }} --> - -