diff --git a/.env.compose.example b/.env.compose.example index a80ab56d..5bc11998 100644 --- a/.env.compose.example +++ b/.env.compose.example @@ -24,14 +24,17 @@ SEED_ADMIN_PASSWORD= # 国内网络可改用镜像:https://registry.npmmirror.com NPM_REGISTRY=https://registry.npmjs.org +# Optional AI-only outbound HTTP proxy. Use ai:4112 rather than bare ai: +# some HTTP clients interpret bare ai as a suffix and bypass proxies for *.ai. +AI_USE_ENV_PROXY=0 +AI_OUTBOUND_PROXY= +AI_NO_PROXY=localhost,127.0.0.1,::1,api,ai:4112,worker,minio + # ── 模型(可选)── # 只是首启兜底,之后在编辑器「设置」页维护。全部留空也能启动。 # REASONING_MODEL_BASE_URL= # REASONING_MODEL_API_KEY= # REASONING_MODEL_ID= -# VISION_MODEL_BASE_URL= -# VISION_MODEL_API_KEY= -# VISION_MODEL_ID= # EMBEDDING_MODEL_BASE_URL= # EMBEDDING_MODEL_API_KEY= # EMBEDDING_MODEL_ID= diff --git a/apps/app/index.html b/apps/app/index.html index 1481c6f0..577e03f1 100644 --- a/apps/app/index.html +++ b/apps/app/index.html @@ -2,7 +2,8 @@ - + + diff --git a/apps/app/public/img/maskLayer.93de78c5.png b/apps/app/public/img/maskLayer.93de78c5.png deleted file mode 100644 index 5150515b..00000000 Binary files a/apps/app/public/img/maskLayer.93de78c5.png and /dev/null differ diff --git a/apps/app/public/img/maskLayer.ef2b23ee.png b/apps/app/public/img/maskLayer.ef2b23ee.png deleted file mode 100644 index aa3d94c7..00000000 Binary files a/apps/app/public/img/maskLayer.ef2b23ee.png and /dev/null differ diff --git a/apps/app/public/lib/sdk/hooks.bundled.d.ts b/apps/app/public/lib/sdk/hooks.bundled.d.ts index 348ecafe..d39d761e 100644 --- a/apps/app/public/lib/sdk/hooks.bundled.d.ts +++ b/apps/app/public/lib/sdk/hooks.bundled.d.ts @@ -174,7 +174,6 @@ declare const ComponentFlatSchema: z.ZodObject<{ "simple-particle": import("..").ExtendsEnum.SimpleParticle; "sw-dataContainer": import("..").ExtendsEnum.SwDataContainer; "sw-weather": import("..").ExtendsEnum.SwWeather; - "sw-mask-layer": import("..").ExtendsEnum.SwMaskLayer; }>, z.ZodEnum<{ rasterProgressBar: import("..").IndicatorEnum.RasterProgressBar; iconRatio: import("..").IndicatorEnum.IconRatio; @@ -3422,35 +3421,6 @@ declare const swDigitalHumanOptionSchema: z.ZodObject<{ }, z.core.$strip>; type ftDigitalHumanOption = z.infer; -import { z } from 'zod'; -declare const swMaskLayerDataSchema: z.ZodArray>; -type ftMaskLayerData = z.infer; -declare const swMaskLayerOptionSchema: z.ZodObject<{ - linearGradient: z.ZodObject<{ - markColor: z.ZodString; - markPosition: z.ZodNumber; - markRadius: z.ZodNumber; - markOpacity: z.ZodNumber; - }, z.core.$strip>; - radioactiveGradation: z.ZodObject<{ - markColor: z.ZodString; - markOpacityRadius: z.ZodNumber; - markOpacity: z.ZodNumber; - markUnOpacityRadius: z.ZodNumber; - showLengthWidthRatio: z.ZodBoolean; - lengthWidthRatio: z.ZodNumber; - }, z.core.$strip>; - markType: z.ZodString; - pointerEvents: z.ZodBoolean; - refresh: z.ZodBoolean; - backdropFilter: z.ZodBoolean; - backdropFilterBlur: z.ZodNumber; - backdropFilterSaturate: z.ZodNumber; -}, z.core.$strip>; -type ftMaskLayerOption = z.infer; - import { z } from 'zod'; declare const swUnrealEngineDataSchema: z.ZodArray; }; - readonly "sw-mask-layer": { - readonly data: z.ZodArray>; - readonly option: z.ZodObject<{ - linearGradient: z.ZodObject<{ - markColor: z.ZodString; - markPosition: z.ZodNumber; - markRadius: z.ZodNumber; - markOpacity: z.ZodNumber; - }, z.core.$strip>; - radioactiveGradation: z.ZodObject<{ - markColor: z.ZodString; - markOpacityRadius: z.ZodNumber; - markOpacity: z.ZodNumber; - markUnOpacityRadius: z.ZodNumber; - showLengthWidthRatio: z.ZodBoolean; - lengthWidthRatio: z.ZodNumber; - }, z.core.$strip>; - markType: z.ZodString; - pointerEvents: z.ZodBoolean; - refresh: z.ZodBoolean; - backdropFilter: z.ZodBoolean; - backdropFilterBlur: z.ZodNumber; - backdropFilterSaturate: z.ZodNumber; - }, z.core.$strip>; - }; readonly "sw-unreal-engine": { readonly data: z.ZodArray; /** 面板类型枚举 Schema */ declare const PanelEnumSchema: z.ZodEnum<{ @@ -13609,7 +13551,6 @@ declare const allComponentTypeSchema: z.ZodUnion, z.ZodEnum<{ rasterProgressBar: import("..").IndicatorEnum.RasterProgressBar; iconRatio: import("..").IndicatorEnum.IconRatio; @@ -15821,8 +15762,6 @@ declare enum ExtendsEnum { SwDataContainer = "sw-dataContainer", /** 天气 */ SwWeather = "sw-weather", - /** 遮罩层 */ - SwMaskLayer = "sw-mask-layer" } /** * 扩展子组件枚举 diff --git a/apps/app/public/logo.png b/apps/app/public/logo.png new file mode 100644 index 00000000..15d66576 Binary files /dev/null and b/apps/app/public/logo.png differ diff --git a/apps/app/src/App.vue b/apps/app/src/App.vue index 3fae013c..43a4616f 100644 --- a/apps/app/src/App.vue +++ b/apps/app/src/App.vue @@ -46,7 +46,7 @@ const contentStyle = computed(() => { watchEffect(() => { const appEl = document.getElementById("app"); if (appEl) { - appEl.style.backgroundColor = isBuildRoute.value ? "#181a24" : ""; + appEl.style.backgroundColor = isBuildRoute.value ? "var(--sw-editor-bg)" : ""; } }); diff --git a/apps/app/src/api/aiModel.ts b/apps/app/src/api/aiModel.ts index 8721e494..4c25cc31 100644 --- a/apps/app/src/api/aiModel.ts +++ b/apps/app/src/api/aiModel.ts @@ -1,8 +1,8 @@ import type { BaseEntity } from "@/model/BaseEntity"; import { serverRequest } from "@/utils/serverService"; -/** 5 个模型角色 */ -export type ModelRole = "reasoning" | "vision" | "embedding" | "image" | "video"; +/** 4 个模型角色 */ +export type ModelRole = "reasoning" | "embedding" | "image" | "video"; export interface AiModelVo { role: ModelRole; diff --git a/apps/app/src/assets/image/models/embedding.png b/apps/app/src/assets/image/models/embedding.png new file mode 100644 index 00000000..199ed8f0 Binary files /dev/null and b/apps/app/src/assets/image/models/embedding.png differ diff --git a/apps/app/src/assets/image/models/image.png b/apps/app/src/assets/image/models/image.png new file mode 100644 index 00000000..367b416e Binary files /dev/null and b/apps/app/src/assets/image/models/image.png differ diff --git a/apps/app/src/assets/image/models/reasoning.png b/apps/app/src/assets/image/models/reasoning.png new file mode 100644 index 00000000..7412191f Binary files /dev/null and b/apps/app/src/assets/image/models/reasoning.png differ diff --git a/apps/app/src/assets/image/models/video.png b/apps/app/src/assets/image/models/video.png new file mode 100644 index 00000000..553f76de Binary files /dev/null and b/apps/app/src/assets/image/models/video.png differ diff --git a/apps/app/src/components/ScreenwrightExtendsComponent/useExtendsComponents.ts b/apps/app/src/components/ScreenwrightExtendsComponent/useExtendsComponents.ts index 32cead0c..e0411f57 100644 --- a/apps/app/src/components/ScreenwrightExtendsComponent/useExtendsComponents.ts +++ b/apps/app/src/components/ScreenwrightExtendsComponent/useExtendsComponents.ts @@ -18,7 +18,6 @@ export const useExtendsComponents = () => { { name: ExtendsEnum.SimpleStar, title: "闪点组件", component: materialMap[ExtendsEnum.SimpleStar]! }, { name: ExtendsEnum.FullScreenSwitch, title: "全屏切换", component: materialMap[ExtendsEnum.FullScreenSwitch]! }, { name: ExtendsEnum.PageReload, title: "页面刷新", component: materialMap[ExtendsEnum.PageReload]! }, - { name: ExtendsEnum.SwMaskLayer, title: "放射性/线性渐变遮罩层", component: materialMap[ExtendsEnum.SwMaskLayer]! }, { name: ExtendsEnum.SimpleParticle, title: "上升粒子", component: materialMap[ExtendsEnum.SimpleParticle]! }, { name: ExtendsEnum.SwDataContainer, title: "数据容器", component: materialMap[ExtendsEnum.SwDataContainer]! }, { name: ExtendsEnum.SwWeather, title: "天气", component: materialMap[ExtendsEnum.SwWeather]! } diff --git a/apps/app/src/layout/Siderbar/aside.scss b/apps/app/src/layout/Siderbar/aside.scss index d9a5af01..d609c629 100644 --- a/apps/app/src/layout/Siderbar/aside.scss +++ b/apps/app/src/layout/Siderbar/aside.scss @@ -14,6 +14,19 @@ background: $sw-surface-2; } + .aside-brand { + display: flex; + flex-shrink: 0; + justify-content: center; + padding: 16px 0 8px; + + img { + display: block; + border-radius: 8px; + object-fit: contain; + } + } + .aside-nav { flex: 1 1 auto; min-height: 0; diff --git a/apps/app/src/layout/Siderbar/index.vue b/apps/app/src/layout/Siderbar/index.vue index 8bd54095..7aff5762 100644 --- a/apps/app/src/layout/Siderbar/index.vue +++ b/apps/app/src/layout/Siderbar/index.vue @@ -2,6 +2,9 @@
+
+ Screenwright Logo +