diff --git a/packages/web-theme/src/publish/app-index-view-layout.ts b/packages/web-theme/src/publish/app-index-view-layout.ts index 627cfdc4e5f330d13e7470ef0571ce8678f8bb09..b63fbd19b75a4cd94d581e1f4643131a661c3bb3 100644 --- a/packages/web-theme/src/publish/app-index-view-layout.ts +++ b/packages/web-theme/src/publish/app-index-view-layout.ts @@ -89,19 +89,20 @@ export default { { "rawItem": { "predefinedType": "APP_APPTITLE", - "rawItemHeight": 90, + "rawItemHeight": 80, "id": "app_apptitle" }, "caption": "应用标题", - "contentHeight": 90, - "height": 90, + "contentHeight": 80, + "height": 80, "itemStyle": "DEFAULT", "itemType": "RAWITEM", "layoutPos": { "shrink": 0, - "height": 90, + "height": 80, "heightMode": "PX", "layout": "FLEX", + "spacingBottom": "OUTERSMALL", "widthMode": "FULL" }, "showCaption": true, @@ -110,17 +111,17 @@ export default { { "rawItem": { "predefinedType": "AUTH_USERINFO", - "rawItemHeight": 68, + "rawItemHeight": 88, "id": "auth_userinfo" }, "caption": "用户信息", - "contentHeight": 68, - "height": 68, + "contentHeight": 88, + "height": 88, "itemStyle": "DEFAULT", "itemType": "RAWITEM", "layoutPos": { "shrink": 0, - "height": 68, + "height": 88, "heightMode": "PX", "layout": "FLEX", "widthMode": "FULL" @@ -128,6 +129,47 @@ export default { "showCaption": true, "id": "auth_userinfo" }, + { + "actionGroupExtractMode": "ITEM", + "panelItems": [ + { + "rawItem": { + "caption": "文本内容", + "halign": "LEFT", + "renderMode": "TEXT", + "valign": "MIDDLE", + "wrapMode": "NOWRAP", + "contentType": "RAW", + "predefinedType": "INDEX_VIEW_SEARCH", + "id": "index_view_search" + }, + "caption": "搜索栏", + "itemStyle": "DEFAULT", + "itemType": "RAWITEM", + "layoutPos": { + "shrink": 1, + "layout": "FLEX" + }, + "showCaption": true, + "id": "index_view_search" + } + ], + "layout": { + "align": "center", + "layout": "FLEX", + "valign": "center" + }, + "dataRegionType": "INHERIT", + "caption": "容器", + "itemStyle": "DEFAULT", + "itemType": "CONTAINER", + "layoutPos": { + "shrink": 0, + "layout": "FLEX", + "widthMode": "FULL" + }, + "id": "container" + }, { "actionGroupExtractMode": "ITEM", "panelItems": [ @@ -166,20 +208,20 @@ export default { }, "dataRegionType": "INHERIT", "caption": "容器", - "contentHeight": 48, - "contentWidth": 48, - "height": 48, + "contentHeight": 32, + "contentWidth": 32, + "height": 32, "itemStyle": "DEFAULT", "itemType": "CONTAINER", "layoutPos": { "shrink": 1, - "height": 48, + "height": 32, "heightMode": "PX", "layout": "FLEX", - "width": 48, + "width": 32, "widthMode": "PX" }, - "width": 48, + "width": 32, "id": "container1" }, { @@ -217,20 +259,20 @@ export default { }, "dataRegionType": "INHERIT", "caption": "容器", - "contentHeight": 48, - "contentWidth": 48, - "height": 48, + "contentHeight": 32, + "contentWidth": 32, + "height": 32, "itemStyle": "DEFAULT", "itemType": "CONTAINER", "layoutPos": { "shrink": 1, - "height": 48, + "height": 32, "heightMode": "PX", "layout": "FLEX", - "width": 48, + "width": 32, "widthMode": "PX" }, - "width": 48, + "width": 32, "id": "container2" }, { @@ -268,20 +310,20 @@ export default { }, "dataRegionType": "INHERIT", "caption": "容器", - "contentHeight": 48, - "contentWidth": 48, - "height": 48, + "contentHeight": 32, + "contentWidth": 32, + "height": 32, "itemStyle": "DEFAULT", "itemType": "CONTAINER", "layoutPos": { "shrink": 1, - "height": 48, + "height": 32, "heightMode": "PX", "layout": "FLEX", - "width": 48, + "width": 32, "widthMode": "PX" }, - "width": 48, + "width": 32, "id": "container3" }, { @@ -319,20 +361,20 @@ export default { }, "dataRegionType": "INHERIT", "caption": "容器", - "contentHeight": 48, - "contentWidth": 48, - "height": 48, + "contentHeight": 32, + "contentWidth": 32, + "height": 32, "itemStyle": "DEFAULT", "itemType": "CONTAINER", "layoutPos": { "shrink": 1, - "height": 48, + "height": 32, "heightMode": "PX", "layout": "FLEX", - "width": 48, + "width": 32, "widthMode": "PX" }, - "width": 48, + "width": 32, "id": "container5" } ], @@ -354,51 +396,6 @@ export default { }, "id": "indexactions" }, - { - "actionGroupExtractMode": "ITEM", - "panelItems": [ - { - "rawItem": { - "caption": "文本内容", - "halign": "LEFT", - "renderMode": "TEXT", - "valign": "MIDDLE", - "wrapMode": "NOWRAP", - "contentType": "RAW", - "predefinedType": "INDEX_VIEW_SEARCH", - "id": "index_view_search" - }, - "caption": "搜索栏", - "itemStyle": "DEFAULT", - "itemType": "RAWITEM", - "layoutPos": { - "shrink": 1, - "layout": "FLEX" - }, - "showCaption": true, - "id": "index_view_search" - } - ], - "layout": { - "align": "center", - "layout": "FLEX", - "valign": "center" - }, - "dataRegionType": "INHERIT", - "caption": "容器", - "contentHeight": 52, - "height": 52, - "itemStyle": "DEFAULT", - "itemType": "CONTAINER", - "layoutPos": { - "shrink": 0, - "height": 52, - "heightMode": "PX", - "layout": "FLEX", - "widthMode": "FULL" - }, - "id": "container" - }, { "caption": "首页菜单", "itemStyle": "DEFAULT", diff --git a/packages/web-theme/src/theme/theme/dark/dark-theme.scss b/packages/web-theme/src/theme/theme/dark/dark-theme.scss index 7930316c8d6c7aba18872159bd9f1aafa0c193bc..ec0c37838eace9433ed31d7886a8062890bb4797 100644 --- a/packages/web-theme/src/theme/theme/dark/dark-theme.scss +++ b/packages/web-theme/src/theme/theme/dark/dark-theme.scss @@ -273,6 +273,7 @@ #{getCssVarName(color, fill, 0)}: rgba(var(#{getCssVarName(white)}), .12); // 填充色 - 默认态 #{getCssVarName(color, fill, 1)}: rgba(var(#{getCssVarName(white)}), .16); // 填充色 - 悬浮态 #{getCssVarName(color, fill, 2)}: rgba(var(#{getCssVarName(white)}), .20); // 填充色 - 激活态 + #{getCssVarName(color, scroll, menu)}: rgba(var(#{getCssVarName(white)}), .20); // 填充色 - 特殊-菜单滚动条颜色 // 背景色 #{getCssVarName(color, border)}: rgba(var(#{getCssVarName(white)}), .08); // 背景色 - 最下层(底部页面) @@ -289,6 +290,7 @@ #{getCssVarName(color, text, 1)}: rgba(var(#{getCssVarName(grey, 9) }), .8); // 文本/图标颜色 - 稍次要 #{getCssVarName(color, text, 2)}: rgba(var(#{getCssVarName(grey, 9) }), .6); // 文本/图标颜色 - 次要 #{getCssVarName(color, text, 3)}: rgba(var(#{getCssVarName(grey, 9)}), .35); // 文本/图标颜色 - 最次要 + #{getCssVarName(color, text, menu)}: rgba(var(#{getCssVarName(white)}), 1); // 文本 - 特殊-菜单颜色 // 圆角 #{getCssVarName(border,radius,extra,small)}: 3px; // 超小圆角,用于 checkbox 内圆角 diff --git a/packages/web-theme/src/theme/theme/default-dark/default-dark-theme.scss b/packages/web-theme/src/theme/theme/default-dark/default-dark-theme.scss index 9590d9c74ab4d403b73b130ab411aee64f64dac2..eaa42662ad63287d63b1846860717c0ec62fd985 100644 --- a/packages/web-theme/src/theme/theme/default-dark/default-dark-theme.scss +++ b/packages/web-theme/src/theme/theme/default-dark/default-dark-theme.scss @@ -314,6 +314,7 @@ #{getCssVarName(color, text, 1)}: rgba(var(#{getCssVarName(dark, purple, 8)}),1); // 文本/图标颜色 - 稍次要 #{getCssVarName(color, text, 2)}: rgba(var(#{getCssVarName(grey, 9)}),.6); // 文本/图标颜色 - 次要 #{getCssVarName(color, text, 3)}: rgba(var(#{getCssVarName(grey, 9)}),.35); // 文本/图标颜色 - 最次要 + #{getCssVarName(color, text, menu)}: rgba(var(#{getCssVarName(white)}), 1); // 文本 - 特殊-菜单颜色 // 链接颜色 #{getCssVarName(color, link)}: rgba(var(#{getCssVarName(blue, 4)}),1); // 链接颜色 @@ -334,6 +335,7 @@ #{getCssVarName(color, fill, 0)}: rgba(var(#{getCssVarName(dark, purple, 4)}),1); // 填充色 - 默认态 #{getCssVarName(color, fill, 1)}: rgba(var(#{getCssVarName(white)}),.16); // 填充色 - 悬浮态 #{getCssVarName(color, fill, 2)}: rgba(var(#{getCssVarName(white)}),.20); // 填充色 - 激活态 + #{getCssVarName(color, scroll, menu)}: rgba(var(#{getCssVarName(white)}), .20); // 填充色 - 特殊-菜单滚动条颜色 // 边框 diff --git a/packages/web-theme/src/theme/theme/default/default-theme.scss b/packages/web-theme/src/theme/theme/default/default-theme.scss index b4a7015efc1f65092558f5cb07263a3d657ba3a3..910fbaea41a728bf6fae329a80f258ffd7cd3962 100644 --- a/packages/web-theme/src/theme/theme/default/default-theme.scss +++ b/packages/web-theme/src/theme/theme/default/default-theme.scss @@ -302,6 +302,7 @@ #{getCssVarName(color, text, 1)}: rgba(var(#{getCssVarName(grey, 7)}),1); // 文本/图标颜色 - 稍次要 #{getCssVarName(color, text, 2)}: rgba(var(#{getCssVarName(grey, 6)}),1); // 文本/图标颜色 - 次要 #{getCssVarName(color, text, 3)}: rgba(var(#{getCssVarName(grey, 4)}),1); // 文本/图标颜色 - 最次要 + #{getCssVarName(color, text, menu)}: rgb(219, 228, 236); // 文本 - 特殊-菜单颜色 // 链接颜色 #{getCssVarName(color, link)}: rgba(var(#{getCssVarName(blue, cyan, 5)}),1); // 链接颜色 @@ -322,6 +323,7 @@ #{getCssVarName(color, fill, 0)}: rgba(var(#{getCssVarName(grey, 8)}),0.05); // 填充色 - 默认态 #{getCssVarName(color, fill, 1)}: rgba(var(#{getCssVarName(grey, 8)}),0.1); // 填充色 - 悬浮态 #{getCssVarName(color, fill, 2)}: rgba(var(#{getCssVarName(grey, 8), }),0.13); // 填充色 - 激活态 + #{getCssVarName(color, scroll, menu)}: rgba(132, 165, 198, 0.4); // 填充色 - 特殊-菜单滚动条颜色 // 边框