From 6899fed2951700fd491d463156f8e7efede66018 Mon Sep 17 00:00:00 2001 From: jingna <1264204245@qq.com> Date: Thu, 15 May 2025 18:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/img/nothing-none-black.png | Bin 0 -> 2179 bytes .../assets/svg/icon_form_outlined_white.svg | 3 + .../svg/icon_play_round_outlined_white.svg | 3 + .../assets/svg/reference-setting-white.svg | 3 + .../empty-background/src/EmptyBackground.vue | 6 +- .../v-query/QueryConditionConfiguration.vue | 11 ++ .../filter/auth-tree-chart/FilterFiled.vue | 2 +- .../editor/filter/auth-tree/FilterFiled.vue | 2 +- .../data/dataset/auth-tree/FilterFiled.vue | 4 +- .../visualized/data/dataset/form/AddSql.vue | 2 +- .../visualized/data/dataset/form/index.vue | 6 +- .../service/dataset/auth-tree/FilterFiled.vue | 2 +- .../service/dataset/form/AddSql.vue | 103 +++++++++++++----- .../service/dataset/form/CalcFieldEdit.vue | 54 ++++++++- .../service/dataset/form/CodeMirror.vue | 19 +++- .../service/dataset/form/DatasetUnion.vue | 19 +++- .../service/dataset/form/UnionFieldList.vue | 13 ++- .../service/dataset/form/index.vue | 78 +++++++++++-- .../application/service/dataset/index.vue | 44 +++++++- .../datasource/form/ApiHttpRequestDraw.vue | 2 +- .../application/service/datasource/index.vue | 9 +- 21 files changed, 318 insertions(+), 67 deletions(-) create mode 100644 core/core-frontend/src/assets/img/nothing-none-black.png create mode 100644 core/core-frontend/src/assets/svg/icon_form_outlined_white.svg create mode 100644 core/core-frontend/src/assets/svg/icon_play_round_outlined_white.svg create mode 100644 core/core-frontend/src/assets/svg/reference-setting-white.svg diff --git a/core/core-frontend/src/assets/img/nothing-none-black.png b/core/core-frontend/src/assets/img/nothing-none-black.png new file mode 100644 index 0000000000000000000000000000000000000000..c33136ab4b211b8d63ac6ed7bc74dd5a4f364226 GIT binary patch literal 2179 zcmV-}2z>X6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2pCC3K~#8N?VVp} zQ&$|vo13&K$eMy+9~6A(XdgE4VS*169jnYit`o&dwf%K%c_g76=5Qn>TL` z+wbU4T?qx=m6U`bR+re?Q*T0rBuxYF%FF9ay$KbUwC*rMX@XLry1KfSidnZHVA&gq zME=Apx@psf4vSm4b_?=KF^e@s|TeoiQkhf|If{7(!DgoElhwtcvNr584 zVDMo24FxC>Dw#}vh~yPJ*RTfp>)qYmnY>C8lBPj0q0FNx5|X`kF3U3KP97poV z&NWQnJ1>h}F^pF6JEJh2!&BeaN+hCOC<3vbG&ME73A13@0XN|U`(2W)3Ra5d=H?aX z4y?vad=bx$sz)l|Nk{M-o&B+acs#yS?3z#$p$NsAnwr`GbHFai5<>0tY?S-Lg$pyo z!^3waTQ&G?&Pp_Z>v;R-&6|0BHr3QjD8h^5MZ(M#YbKFMIK}f5y?D_x6Y#9F&q5^f zOlEl3ty>pD6SW=}z6wptWkgLi>8MspPfyPxGdBJq{!egRSh9QppB_i>O9O=yTsrij{7s()YNogdGnq^#-y0qt{!#J^rXr!ZPH%2*?vBemjiERRc-MwXw*plpR3s9)j%2-^%i|ns z&JPgqt{0PbIwE_tRzj2`$adPLHYmFv4u@BB&PR^Y)6=ZbYwQvmRN`ZmEQVQ-P>k;2F%O(g9z^;AB5{JvkOLnPxL?1+Tx6G|VH3C- z_shB9rz8uS;l-Dpad|G?i^t=ii*3k(OXeWTSCY-ZMLlOYc`Es`C|f95d|0ry0pcBa z7E{x@fY6*Pqnx4n8a%7`2q~Mgnm&Z$+-CUzrnA3vH5Q9;b&;V2Ze1C8+7l!%qX{f) zdcRzcVg%z9DPdVw&DOQ)48-7C{JfP>@(3vi%8D_sP_h8=Bgtk#**Uhsk~PdvL8Zn$ z?1HyNBwLbsg@V^mb?1XG9twp_0I>k@h~P@$f|a`vs}Fszc?S+k3dOb+NnSrdI9~18 z)$_>Q+#I_w&d%;ibdV2=U6i6iNdR$Fvbj8LZf-Um+X@&N8JWO6Ex30GEcVa0eYU7j z_`uJQxQ&YURx$))ut9gmEnE+wykOr|F0S)Y=rg^99V zaLL_hJKZ*wonpiyw!tH$@;d{wF#4zk;d)jm3CG>ydCvQPDYn5wiiPW7xAVB3T#w>j zTDOA;d*PE{ z+>g(ug7GGNfSGHm0mZ^~-2ZH!H6U~Qf5CQ+Lfk+&&NCtmH2|#|x5{#jMK0Xmykc~8 z^icr+VHf_xH}ZyG;6t`I8jV(cPDHuLjd};>F1y4x9D>6fv+(0ymjXY*l=@OdQ{llTp7gaS*0!QePe`&#t5YeMkq}%LTQ2#N)wDwnqY*|1S6Ct7@;)52&D-W%4`DA019>A zHVr-{{Wlw}RN)_qH290OJ{I^joi+FpI8s_4OSZODbaJpkIb-2)_!NzF)Cbje;>Cmh z4E}+C{BmdJIHR;satb5=T)1a{7S&J{58*f)(AwRW{L{0L#>dAemn~a%e(~bP{~*hg zMV3I(7wmTpHQ*8M`A@j#7aJQJdj{{fR5#swsDs=NRI002ovPDHLk FV1mc*^7Q}! literal 0 HcmV?d00001 diff --git a/core/core-frontend/src/assets/svg/icon_form_outlined_white.svg b/core/core-frontend/src/assets/svg/icon_form_outlined_white.svg new file mode 100644 index 0000000..b6087c9 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_form_outlined_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/icon_play_round_outlined_white.svg b/core/core-frontend/src/assets/svg/icon_play_round_outlined_white.svg new file mode 100644 index 0000000..4ee6d01 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_play_round_outlined_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/reference-setting-white.svg b/core/core-frontend/src/assets/svg/reference-setting-white.svg new file mode 100644 index 0000000..a5f22f1 --- /dev/null +++ b/core/core-frontend/src/assets/svg/reference-setting-white.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue b/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue index 073bd61..2e47e35 100644 --- a/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue +++ b/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue @@ -6,7 +6,7 @@ import nothingTable from '@/assets/img/nothing-table.png' import none from '@/assets/img/none.png' import error from '@/assets/img/error.png' import nothingTree from '@/assets/img/nothing-tree.png' -import nothingNone from '@/assets/img/nothing-none.png' +import nothingNone from '@/assets/img/nothing-none-black.png' defineProps({ imgType: { type: String as PropType< @@ -51,7 +51,6 @@ const getAssetsFile = { } :deep(.ed-empty__description) { margin-top: 8px; - color: var(--N600, #d2d2d2); text-align: center; /* 正文-字号 14，行高 22，字重适中（Regular），用于列表Feed会话 */ @@ -61,4 +60,7 @@ const getAssetsFile = { font-weight: 400; line-height: 22px; } +:deep(.ed-empty__image){ + width: 106px !important; +} diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 7dd63e6..1430f57 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -3930,4 +3930,15 @@ defineExpose({ background: rgb(41,41,41); border: 1px solid #434343; } +.ed-select-v2__wrapper{ + background-color: #252424; + box-shadow: 0 0 0 1px #434343 inset; + border:none; +} +.ed-select-v2__placeholder{ + color:#fff; +} +.ed-radio__inner{ + background: transparent; +} diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue index 37f6ff6..844950d 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue @@ -468,7 +468,7 @@ const emits = defineEmits(['update:item', 'del'])
  • { z-index: 10; &:hover { .ed-icon { - color: var(--ed-color-primary, #3370ff) !important; + color: var(--ed-color-primary, #3370ff); } } } diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue index bcc2609..4d154ba 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue @@ -2963,7 +2963,7 @@ const getDsIconName = data => { z-index: 10; &:hover { .ed-icon { - color: var(--ed-color-primary, #3370ff) !important; + color: var(--ed-color-primary, #3370ff); } } } @@ -3203,8 +3203,8 @@ const getDsIconName = data => { } .ed-button.is-secondary.is-disabled { - color: #bbbfc4 !important; - border-color: #bbbfc4 !important; + color: #5f5f5f !important; + border-color: #5f5f5f !important; } .father .child { diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue index 2338c84..dcb594e 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue @@ -358,7 +358,7 @@ const emits = defineEmits(['update:item', 'del'])
  • import referencePlay from '@/assets/svg/reference-play.svg' -import referenceSetting1 from '@/assets/svg/reference-setting.svg' +import referenceSetting1 from '@/assets/svg/reference-setting-white.svg' import icon_preferences_outlined from '@/assets/svg/icon_preferences_outlined.svg' import icon_close_outlined from '@/assets/svg/icon_close_outlined.svg' import icon_right_outlined from '@/assets/svg/icon_right_outlined.svg' import icon_left_outlined from '@/assets/svg/icon_left_outlined.svg' import referenceTable from '@/assets/svg/reference-table.svg' import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg' -import icon_form_outlined from '@/assets/svg/icon_form_outlined.svg' +import icon_form_outlined_white from '@/assets/svg/icon_form_outlined_white.svg' import icon_copy_outlined from '@/assets/svg/icon_copy_outlined.svg' import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg' import icon_textBox_outlined from '@/assets/svg/icon_text-box_outlined.svg' import icon_info_colorful from '@/assets/svg/icon_info_colorful.svg' -import icon_playRound_outlined from '@/assets/svg/icon_play-round_outlined.svg' +import icon_play_round_outlined_white from '@/assets/svg/icon_play_round_outlined_white.svg' import { searchVariableApi } from '@/api/variable' import { ref, @@ -546,7 +546,7 @@ const mousedownDrag = () => {
    - + {{ t('data_set.run') }} - + @@ -670,8 +670,8 @@ const mousedownDrag = () => { :title="datasourceTableData[index].tableName" @click="setActiveName(datasourceTableData[index])" > - - + + {{ datasourceTableData[index].tableName }} @@ -827,8 +827,8 @@ const mousedownDrag = () => {
    {{ t('data_set.click_above') }} - {{ t('data_set.see_the_results') }} @@ -1145,7 +1145,7 @@ const mousedownDrag = () => { width: 240px; float: left; font-family: var(--de-custom_font, 'PingFang'); - border-right: 1px solid rgba(31, 35, 41, 0.15); + border-right: 1px solid #434343; .list-item_primary { padding: 8px; @@ -1160,7 +1160,7 @@ const mousedownDrag = () => { font-weight: 500; display: flex; justify-content: space-between; - color: var(--deTextPrimary, #1f2329); + color: var(--deTextPrimary, #ffffff); position: relative; i { @@ -1186,7 +1186,7 @@ const mousedownDrag = () => { z-index: 10; &:hover { .ed-icon { - color: var(--ed-color-primary, #3370ff) !important; + color: var(--ed-color-primary, #3370ff); } } } @@ -1198,7 +1198,7 @@ const mousedownDrag = () => { align-items: center; font-weight: 400; font-size: 14px; - color: #646a73; + color: #ffffff; .ed-icon { margin-right: 5.33px; } @@ -1207,7 +1207,7 @@ const mousedownDrag = () => { i { cursor: auto; font-size: 16px; - color: var(--deTextPlaceholder, #646a73); + color: var(--deTextPlaceholder, #ffffff); } } @@ -1229,6 +1229,7 @@ const mousedownDrag = () => { padding-right: 4px; .label { width: calc(100% - 4px); + color: #fff; } &:hover { .label { @@ -1297,6 +1298,7 @@ const mousedownDrag = () => { .padding-24 { width: calc(100% - 48px); .border-bottom-tab(24px); + margin-left: 0px; } .table-sql { @@ -1374,7 +1376,7 @@ const mousedownDrag = () => { .handle-system { height: 100%; width: 280px; - border-left: 1px solid #1f232926; + border-left: 1px solid #434343; position: absolute; right: 0; top: 0; @@ -1388,6 +1390,7 @@ const mousedownDrag = () => { align-items: center; justify-content: space-between; height: 54px; + color: #ffffff; } .handle-system_list { @@ -1407,10 +1410,10 @@ const mousedownDrag = () => { .variable-item { cursor: pointer; padding: 1px 8px; - border: solid 1px #dee0e3; + border: solid 1px #434343; margin-bottom: 8px; - background-color: white; - color: #1f2329; + background-color: #252626; + color: #ffffff; font-size: 14px; .ed-icon { @@ -1457,7 +1460,7 @@ const mousedownDrag = () => { padding: 0 16px; display: flex; align-items: center; - border-bottom: 1px solid rgba(31, 35, 41, 0.15); + border-bottom: 1px solid #434343; .name { width: 240px; margin: 8px; @@ -1492,7 +1495,7 @@ const mousedownDrag = () => { } .system-text_bg { - color: #1f2329; + color: #ffffff !important; &:hover { background: #1f23291a; } @@ -1514,7 +1517,7 @@ const mousedownDrag = () => { } } .icon-color { - color: #646a73; + color: #ffffff; } diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue index 866e5a1..f3c3f2c 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue @@ -627,7 +627,7 @@ initFunction() @@ -666,7 +666,7 @@ initFunction() align-items: center; justify-content: center; background: rgb(38,38,38); - border: 1px solid #bbbfc4; + border: 1px solid #434343; border-radius: 4px; .is-active { @@ -690,7 +690,7 @@ initFunction() margin-bottom: 8px; display: inline-flex; align-items: center; - color: #1f2329; + color: #ffffff; &.field-exp { & > :nth-child(2) { @@ -716,7 +716,7 @@ initFunction() overflow-y: hidden; .padding-lr-content { padding: 12px; - border: 1px solid var(--deCardStrokeColor, #dee0e3); + border: 1px solid #363636; box-sizing: border-box; height: 500px; border-radius: 4px; @@ -794,7 +794,7 @@ initFunction() .item-dimension, .item-quota { padding: 1px 8px; - border: solid 1px #dee0e3; + border: solid 1px #363636; background-color: rgb(37, 38, 38); color: #ffffff; @@ -894,4 +894,48 @@ initFunction() outline: none; } } +.ed-dialog__header{ + padding: 13px 20px; + border-bottom: 1px solid #333333; + margin-right: 0px; +} +.ed-dialog__headerbtn{ + color: #ffffff; +} +.ed-dialog__title{ + color: #ffffff; +} +.ed-dialog__headerbtn{ + top: 13px !important; +} +.ed-dialog { + border: 1px solid #5f5f5f; + border-radius: 4px; +} +.ed-popper.is-dark { + border: 1px solid #434343; + background: rgba(41, 41, 41, 1) !important; +} +.ed-popper[data-popper-placement^=bottom] .ed-popper__arrow::before { + background: rgba(41, 41, 41, 1) !important; +} +.ed-popover.ed-popper{ + background: rgba(41, 41, 41, 1); + border: 1px solid #434343; + color: #fff; +} +.ed-input-number__decrease, .ed-input-number__increase{ + background-color: #434343 !important; + color:#ffffff; +} +.ed-input-number.is-controls-right .ed-input-number__increase{ + border-bottom: 1px solid #5f5f5f !important; + border-left: 1px solid #5f5f5f !important; +} +.ed-input-number.is-controls-right .ed-input-number__decrease{ + border-left: 1px solid #5f5f5f !important; +} +.ed-input-number--light .ed-input-number__increase .ed-icon{ + color: #fff; +} diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/CodeMirror.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/CodeMirror.vue index 7f7d239..a77dd42 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/form/CodeMirror.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/CodeMirror.vue @@ -106,7 +106,7 @@ const codeComInit = (doc: string, sqlMode?: boolean) => { elt.style.margin = '0 4px' elt.style.padding = '0 6px' elt.style.background = isQuota ? 'rgba(0, 214, 185, 0.20)' : 'rgba(51, 112, 255, 0.20)' - elt.style.color = isQuota ? '#04B49C' : '#2B5FD9' + elt.style.color = isQuota ? '#03c9ae' : '#0089ff' return elt } ignoreEvent() { @@ -151,6 +151,21 @@ defineExpose({ .cm-editor, .cm-scroller { height: 100% !important; - background: #eff0f1; + background: rgb(19,19,19); + color: #fff; +} +.cm-line{ + caret-color: rgb(19,19,19) !important; +} +.ͼ2 .cm-activeLine { + background-color: #434343; +} +.ͼ2 .cm-gutters { + background-color: rgb(19,19,19); + color: #ffffff; + border-right: 1px solid #5f5f5f; +} +.ͼ2 .cm-activeLineGutter{ + background-color: #434343; } diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue index e2d6b0a..b1af5d4 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue @@ -1197,9 +1197,7 @@ const emits = defineEmits([