From 6c8143b7de54724ce8e7e3d1d40bd2052cce25e3 Mon Sep 17 00:00:00 2001
From: DDMeaqua <lzlloveyou@vip.qq.com>
Date: Tue, 24 Sep 2024 15:15:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=80=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8artifacts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/markdown.tsx |  5 ++++-
 app/components/mask.tsx     | 32 +++++++++++++++++---------------
 app/components/settings.tsx | 14 ++++++++++++++
 app/store/config.ts         |  2 ++
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/components/markdown.tsx b/app/components/markdown.tsx
index 4f1b0ed24ea..c0833caf72b 100644
--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -21,6 +21,7 @@ import {
 } from "./artifacts";
 import { useChatStore } from "../store";
 import { IconButton } from "./button";
+import { useAppConfig } from "../store/config";
 
 export function Mermaid(props: { code: string }) {
   const ref = useRef<HTMLDivElement>(null);
@@ -92,7 +93,9 @@ export function PreCode(props: { children: any }) {
     }
   }, 600);
 
-  const enableArtifacts = session.mask?.enableArtifacts !== false;
+  const config = useAppConfig();
+  const enableArtifacts =
+    session.mask?.enableArtifacts !== false && config.enableArtifacts;
 
   //Wrap the paragraph for plain-text
   useEffect(() => {
diff --git a/app/components/mask.tsx b/app/components/mask.tsx
index e4dd90826c7..c60e7a528fe 100644
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -166,21 +166,23 @@ export function MaskConfig(props: {
           ></input>
         </ListItem>
 
-        <ListItem
-          title={Locale.Mask.Config.Artifacts.Title}
-          subTitle={Locale.Mask.Config.Artifacts.SubTitle}
-        >
-          <input
-            aria-label={Locale.Mask.Config.Artifacts.Title}
-            type="checkbox"
-            checked={props.mask.enableArtifacts !== false}
-            onChange={(e) => {
-              props.updateMask((mask) => {
-                mask.enableArtifacts = e.currentTarget.checked;
-              });
-            }}
-          ></input>
-        </ListItem>
+        {globalConfig.enableArtifacts && (
+          <ListItem
+            title={Locale.Mask.Config.Artifacts.Title}
+            subTitle={Locale.Mask.Config.Artifacts.SubTitle}
+          >
+            <input
+              aria-label={Locale.Mask.Config.Artifacts.Title}
+              type="checkbox"
+              checked={props.mask.enableArtifacts !== false}
+              onChange={(e) => {
+                props.updateMask((mask) => {
+                  mask.enableArtifacts = e.currentTarget.checked;
+                });
+              }}
+            ></input>
+          </ListItem>
+        )}
 
         {!props.shouldSyncFromGlobal ? (
           <ListItem
diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index 33bf8b2e74e..8f90c4c36a4 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -1465,6 +1465,20 @@ export function Settings() {
               }
             ></input>
           </ListItem>
+
+          <ListItem title="artifact" subTitle="artifacts">
+            <input
+              aria-label="artifacts"
+              type="checkbox"
+              checked={config.enableArtifacts}
+              onChange={(e) =>
+                updateConfig(
+                  (config) =>
+                    (config.enableArtifacts = e.currentTarget.checked),
+                )
+              }
+            ></input>
+          </ListItem>
         </List>
 
         <SyncItems />
diff --git a/app/store/config.ts b/app/store/config.ts
index 615cc8e82a3..3dcd4d86b80 100644
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -50,6 +50,8 @@ export const DEFAULT_CONFIG = {
   enableAutoGenerateTitle: true,
   sidebarWidth: DEFAULT_SIDEBAR_WIDTH,
 
+  enableArtifacts: true, // show artifacts config
+
   disablePromptHint: false,
 
   dontShowMaskSplashScreen: false, // dont show splash screen when create chat

From 269d064e0a7b7b3690cc9aa0f3204960f1bee912 Mon Sep 17 00:00:00 2001
From: DDMeaqua <lzlloveyou@vip.qq.com>
Date: Tue, 24 Sep 2024 15:21:27 +0800
Subject: [PATCH 2/2] fix: #5450

---
 app/components/settings.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index 8f90c4c36a4..fcb106385da 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -1466,9 +1466,12 @@ export function Settings() {
             ></input>
           </ListItem>
 
-          <ListItem title="artifact" subTitle="artifacts">
+          <ListItem
+            title={Locale.Mask.Config.Artifacts.Title}
+            subTitle={Locale.Mask.Config.Artifacts.SubTitle}
+          >
             <input
-              aria-label="artifacts"
+              aria-label={Locale.Mask.Config.Artifacts.Title}
               type="checkbox"
               checked={config.enableArtifacts}
               onChange={(e) =>