fix: 🐛 修复搜索接口调整导致的搜索异常

adams549659584 · Aug 27, 2022 · e9a8c74 · e9a8c74
1 parent 4f6e707
commit e9a8c74
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 657 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,11 @@
 
 ![Instructions.gif](https://s1.ax1x.com/2020/08/19/dQ8R3t.gif)
 
+### v1.7.3
+
+- 修复搜索接口调整导致的搜索异常
+- 基金详情新增操作按钮（键盘操作未变：enter 关闭， ← → 切换导航，↑ ↓ 切换基金）
+
 ### v1.7.2
 
 - 基金明细加上随机UA

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "utools-fund",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "自选基金助手",
   "main": "main.ts",
   "scripts": {
@@ -17,10 +17,8 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript": "^1.0.1",
     "tslib": "^2.3.0",
     "typescript": "^4.3.5"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -7,7 +7,7 @@ import commonjs from 'rollup-plugin-commonjs';
 import pluginConfig from './plugin.config.js';
 import copy from 'rollup-plugin-copy';
 import replace from 'rollup-plugin-replace';
-import { terser } from 'rollup-plugin-terser';
+// import { terser } from 'rollup-plugin-terser';
 
 /**
  * 当前环境

diff --git a/src/assets/html/fundDetail/fundDetail.css b/src/assets/html/fundDetail/fundDetail.css
diff --git a/src/assets/html/fundDetail/fundDetail.js b/src/assets/html/fundDetail/fundDetail.js
diff --git a/src/features/fundAdd.ts b/src/features/fundAdd.ts
@@ -30,7 +30,7 @@ const fundAdd: TplFeature = {
         const searchResult = await get<ISearchFundResult>(`http://fundsuggest.eastmoney.com/FundSearch/api/FundSearchAPI.ashx?m=1&key=${searchWord}`);
         if (searchResult) {
           if (searchResult.ErrCode === 0) {
-            cbList = searchResult.Datas.map(fund => {
+            cbList = searchResult.Datas.filter(x => !!x.FundBaseInfo).map(fund => {
               const cb: CallbackListItem = {
                 title: fund.CODE,
                 description: fund.NAME,

diff --git a/src/features/fundMy.ts b/src/features/fundMy.ts
@@ -191,15 +191,8 @@ const unregisterShortCut = async () => {
   // Mousetrap.unbind(['up', 'down', 'mod+del', 'mod+ins']);
 };
 const showFundDetail = async (fundEnt: Partial<IFundEnt>) => {
-  const dbList = FundDBHelper.getAll();
-  const fundList = dbList.map(db => {
-    return {
-      fundcode: db.data.id,
-      name: db.data.name,
-    };
-  });
-  const fundIndex = fundList.findIndex(x => x.fundcode === fundEnt.id);
-  const url = `/assets/html/fundDetail/fundDetail.html?fundList=${encodeURIComponent(JSON.stringify(fundList))}&fundIndex=${fundIndex}`;
+  const url = `/assets/html/fundDetail/fundDetail.html?id=${fundEnt.id}`;
+  // console.log(`url : `, url);
   // const title = `${fundName}(${fundCode})`;
   const fundDetailUbWindow = utools.createBrowserWindow(
     url,

diff --git a/src/main.ts b/src/main.ts
@@ -5,10 +5,13 @@ import fundMarket from './features/fundMarket';
 import fundExport from './features/fundExport';
 import fundMy from './features/fundMy';
 import fundImport from './features/fundImport';
+import FundDBHelper from './Helper/FundDBHelper';
 
-window.utoolsFunc = function () {
-  console.log(`utoolsFunc : `);
-  // utools.outPlugin();
+window.utoolsCusFn = {
+  openUrl: (url: string) => utools.shellOpenExternal(url),
+  fundDBHelper: {
+    getAll: () => FundDBHelper.getAll(),
+  },
 };
 
 const preload: TemplatePlugin = {