♻️ 优化搜索内容排序，修复setSubInput 无法触发 inputChange bug

rubickCenter · Nov 13, 2023 · 6c096fc · 6c096fc
1 parent 1656418
commit 6c096fc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "author": "muwoo <[email protected]>",
   "private": true,
   "scripts": {

diff --git a/src/main/common/api.ts b/src/main/common/api.ts
@@ -190,6 +190,7 @@ class API extends DBInstance {
         value: data.text,
       })})`
     );
+    this.sendSubInputChangeEvent({ data });
   }
 
   public getPath({ data }) {

diff --git a/src/renderer/plugins-manager/index.ts b/src/renderer/plugins-manager/index.ts
@@ -118,7 +118,7 @@ const createPluginManager = (): any => {
     if (isPin) {
       pin.forEach((p, index) => {
         if (p.name === plugin.name) {
-          pin.splice(index, 1);
+          plugin = pin.splice(index, 1)[0];
         }
       });
       pin.unshift(plugin);

diff --git a/src/renderer/plugins-manager/options.ts b/src/renderer/plugins-manager/options.ts
@@ -41,6 +41,17 @@ const optionsManager = ({
     options[0].click();
   });
 
+  const getIndex = (cmd, value) => {
+    let index = 0;
+    if (PinyinMatch.match(cmd.label || cmd, value)) {
+      index += 1;
+    }
+    if (cmd.label) {
+      index -= 1;
+    }
+    return index;
+  };
+
   const getOptionsFromSearchValue = (value, strict = false) => {
     const localPlugins = getGlobal('LOCAL_PLUGINS').getLocalPlugins();
     let options: any = [];
@@ -61,7 +72,7 @@ const optionsManager = ({
               desc: fe.explain,
               type: plugin.pluginType,
               match: PinyinMatch.match(cmd.label || cmd, value),
-              zIndex: cmd.label ? 0 : 1, // 排序权重
+              zIndex: getIndex(cmd, value), // 排序权重
               click: () => {
                 pluginClickEvent({
                   plugin,
@@ -117,7 +128,7 @@ const optionsManager = ({
         .map((plugin) => {
           const option = {
             ...plugin,
-            zIndex: 1,
+            zIndex: 0,
             click: () => {
               openPlugin(plugin, option);
             },
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,6 +190,7 @@ class API extends DBInstance { @@
             value: data.text,
           })})`
         );
+        this.sendSubInputChangeEvent({ data });
       }
       public getPath({ data }) {
@@ Expand Down @@