From 8d4a519e4a9a3607b9c4239b08fb3494c99cbe48 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Sun, 27 Feb 2022 22:56:02 +0800
Subject: [PATCH] feat(client): improve system settings module

---
 .../collection-manager/hooks/useCollectionField.ts   |  1 -
 .../src/route-switch/antd/admin-layout/index.tsx     | 12 +++++++++++-
 .../schema-component/antd/filter/Filter.Action.tsx   |  1 -
 .../src/system-settings/SystemSettingsProvider.tsx   |  2 +-
 .../src/system-settings/SystemSettingsShortcut.tsx   | 11 +++++++++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/collection-manager/hooks/useCollectionField.ts b/packages/client/src/collection-manager/hooks/useCollectionField.ts
index 4d7c51f4d..10771ee27 100644
--- a/packages/client/src/collection-manager/hooks/useCollectionField.ts
+++ b/packages/client/src/collection-manager/hooks/useCollectionField.ts
@@ -16,7 +16,6 @@ export const useCollectionField = () => {
   }
   const resourceName = `${ctx?.collectionName || collection?.name}.${ctx.name}`;
   const resource = api?.resource(resourceName, record[ctx.sourceKey]);
-  debugger;
   return {
     ...ctx,
     uiSchema: compile(ctx.uiSchema),
diff --git a/packages/client/src/route-switch/antd/admin-layout/index.tsx b/packages/client/src/route-switch/antd/admin-layout/index.tsx
index 6cbd67af7..3e1761f5d 100644
--- a/packages/client/src/route-switch/antd/admin-layout/index.tsx
+++ b/packages/client/src/route-switch/antd/admin-layout/index.tsx
@@ -1,3 +1,4 @@
+import { css } from '@emotion/css';
 import { Layout } from 'antd';
 import React, { useRef, useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
@@ -34,7 +35,16 @@ const InternalAdminLayout = (props: any) => {
     <Layout>
       <Layout.Header style={{ height: 46, lineHeight: '46px', position: 'relative', paddingLeft: 0 }}>
         <div style={{ display: 'flex' }}>
-          <div style={{ display: 'inline-flex', color: '#fff', padding: '0 24px' }}>{result?.data?.data?.title}</div>
+          <div style={{ width: 200, display: 'inline-flex', color: '#fff', padding: '0', alignItems: 'center' }}>
+            <img
+              className={css`
+                height: 20px;
+                padding: 0 16px;
+              `}
+              src={result?.data?.data?.logo?.url}
+            />
+            {/* {result?.data?.data?.title} */}
+          </div>
           <RemoteSchemaComponent
             hidden={hidden}
             uid={route.uiSchemaUid}
diff --git a/packages/client/src/schema-component/antd/filter/Filter.Action.tsx b/packages/client/src/schema-component/antd/filter/Filter.Action.tsx
index 4eedfc1c1..a5d5db406 100644
--- a/packages/client/src/schema-component/antd/filter/Filter.Action.tsx
+++ b/packages/client/src/schema-component/antd/filter/Filter.Action.tsx
@@ -65,7 +65,6 @@ export const FilterAction = observer((props: any) => {
                   onSubmit={() => {
                     const { filter } = form.values;
                     console.log('Table.Filter====', form.values);
-                    debugger;
                     setVisible(false);
                   }}
                 >
diff --git a/packages/client/src/system-settings/SystemSettingsProvider.tsx b/packages/client/src/system-settings/SystemSettingsProvider.tsx
index a7ecbd2a6..6f735fd04 100644
--- a/packages/client/src/system-settings/SystemSettingsProvider.tsx
+++ b/packages/client/src/system-settings/SystemSettingsProvider.tsx
@@ -11,7 +11,7 @@ export const useSystemSettings = () => {
 
 export const SystemSettingsProvider: React.FC = (props) => {
   const result = useRequest({
-    url: 'systemSettings:get/1',
+    url: 'systemSettings:get/1?appends=logo',
   });
   if (result.loading) {
     return <Spin />;
diff --git a/packages/client/src/system-settings/SystemSettingsShortcut.tsx b/packages/client/src/system-settings/SystemSettingsShortcut.tsx
index 1ec7f7e19..8161de39c 100644
--- a/packages/client/src/system-settings/SystemSettingsShortcut.tsx
+++ b/packages/client/src/system-settings/SystemSettingsShortcut.tsx
@@ -3,7 +3,7 @@ import { ISchema, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import React, { useState } from 'react';
 import { useSystemSettings } from '.';
-import { PluginManager, useRequest } from '..';
+import { PluginManager, useAPIClient, useRequest } from '..';
 import { ActionContext, SchemaComponent, useActionContext } from '../schema-component';
 
 const useCloseAction = () => {
@@ -16,7 +16,7 @@ const useCloseAction = () => {
   };
 };
 
-const useSystemSettingsValues = (props, options) => {
+const useSystemSettingsValues = (options) => {
   const result = useSystemSettings();
   return useRequest(() => Promise.resolve(result.data), {
     ...options,
@@ -27,6 +27,7 @@ const useSaveSystemSettingsValues = () => {
   const { setVisible } = useActionContext();
   const form = useForm();
   const { mutate } = useSystemSettings();
+  const api = useAPIClient();
   return {
     async run() {
       await form.submit();
@@ -34,6 +35,11 @@ const useSaveSystemSettingsValues = () => {
       mutate({
         data: form.values,
       });
+      await api.request({
+        url: 'systemSettings:update/1',
+        method: 'post',
+        data: form.values,
+      });
     },
   };
 };
@@ -63,6 +69,7 @@ const schema: ISchema = {
           'x-decorator': 'FormItem',
           'x-component': 'Upload.Attachment',
           'x-component-props': {
+            'action': 'attachments:upload'
             // accept: 'jpg,png'
           },
         },