V8.0.1 (#631)

* fix: 修复数据合并导致的折叠问题

* fix: 修复股吧数据

* fix: 修复row折叠问题

* fix: 修复QuotationFlow样式

* fix: 修复基金经理页面错误

* bump: 8.0.1

release/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fishing-funds",
   "productName": "Fishing Funds",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "main": "./dist/main/index.js",
   "description": "基金,大盘,股票,虚拟货币状态栏显示小应用,基于Electron开发,支持 MacOS,Windows,Linux客户端,数据源来自天天基金,蚂蚁基金,爱基金,腾讯证券等",
   "author": {

src/renderer/components/Home/FundView/DetailFundContent/index.tsx

@@ -87,8 +87,7 @@ export const DetailFund: React.FC<DetailFundProps> = (props) => {
   const { star: fundStar, type: fundType } = useFundRating(code);
   const codeMap = useAppSelector((state) => state.wallet.fundConfigCodeMap);
   const { data: addCode, show: showAddDrawer, set: setAddDrawer, close: closeAddDrawer } = useDrawer(code);
-  const [showManagerDrawer, { setTrue: openManagerDrawer, setFalse: closeManagerDrawer, toggle: ToggleManagerDrawer }] =
-    useBoolean(false);
+  const [showManagerDrawer, { setTrue: openManagerDrawer, setFalse: closeManagerDrawer }] = useBoolean(false);
 
   const { data: fund = {} } = useRequest(() => Services.Fund.GetFixFromEastMoney(code));
   const { data: pingzhongdata = {} as Fund.PingzhongData | Record<string, any>, run: runGetFundDetailFromEastmoney } =

src/renderer/components/Home/FundView/FundManagerContent/index.tsx

@@ -25,7 +25,7 @@ export interface ManagerDetail {
 }
 
 const FundManagerContent: React.FC<FundManagerContentProps> = (props) => {
-  const { manager } = props;
+  const { manager = {} as Fund.Manager.Info } = props;
   const ref = useRef(null);
   const position = useScroll(ref, (val) => val.top <= 520);
   const miniMode = position && position.top > 40;
@@ -37,6 +37,7 @@ const FundManagerContent: React.FC<FundManagerContentProps> = (props) => {
     },
   } = useRequest(Services.Fund.GetFundManagerDetailFromEastMoney, {
     defaultParams: [manager.id],
+    ready: !!manager.id,
   });
 
   return (

src/renderer/components/Home/QuotationView/QuotationFlow/index.module.scss

@@ -1,4 +1,4 @@
 .content {
   display: block;
-  height: calc(100vh - 202px);
+  height: calc(100vh - 220px);
 }

src/renderer/helpers/base.ts

@@ -31,6 +31,16 @@ export function Update<T extends {}>(config: { key: keyof T; list: T[]; data: T
   return list as Required<T>[];
 }
 
+export function Merge<T extends {}>(config: { data: T; overide: Partial<T> }) {
+  const { overide, data } = config;
+
+  Object.keys(overide).forEach((k) => {
+    (data[k as keyof T] as any) = overide[k as keyof T];
+  });
+
+  return data;
+}
+
 export function Delete<T extends {}>(config: { key: keyof T; list: T[]; data: string }) {
   const { list, key, data } = config;