search ok

Author: jae-jae

crx/extension/popup.js

@@ -1,7 +1,7 @@
 /* global parent, Event, sessionStorage */
 
 import timeago from 'timeago.js'
-import fuzzy from 'fuzzy'
+import fuzzy from 'fuzzy.js'
 
 let config = {
   api: 'https://greasyfork.org/en/scripts/by-site/{host}.json'
@@ -93,12 +93,28 @@ export default {
 
   searcher (data,query) {
     let rt = []
-    for(i =0 ; i < data.length; i++) {
+    for(let i =0 ; i < data.length; i++) {
       let item = data[i]
       let max = null
-      for(j in ['name','description','user']) {
-        
+      let frt = null
+      for(let key of ['name','description','user']) {
+        if (key === 'user') {
+          frt = fuzzy(item['user']['name'],query)
+        } else {
+          frt = fuzzy(item[key],query)
+        }
+        if (max === null) {
+          max = frt
+        } else if (max.score < frt.score) {
+          max = frt
+        }
       }
+      rt.push({
+        item,
+        'score': max.score
+      })
     }
+    rt = rt.filter((a) => a.score !== 0).sort((a, b) => b.score - a.score).map((a) => a.item)
+    return rt
   }
 }

crx/src/common/js/locale.js

@@ -11,11 +11,11 @@
                       </i18n>
                       - Userscript+
                     </span>
-                    <Input v-else v-model="searchInput"  icon="android-search" placeholder="Enter something..." style="width: 450px"></Input>
+                    <Input v-else v-model="searchInput"  icon="android-search" placeholder="Enter title、description、author..." style="width: 450px"></Input>
                 </div>
                 <div slot="extra">
                 <span>
-                  <Tooltip content="Search" placement="bottom">
+                  <Tooltip :content="$t('table.search')" placement="bottom">
                         <Button type="dashed" @click="showSearchInput = !showSearchInput">
                             <Icon type="android-search"></Icon>
                         </Button>
@@ -102,9 +102,8 @@
 	/* global Event */
     import Tools from '../common/js/tools'
     import Info from './Info.vue'
-    import Indicator from './Indicator.vue'
     export default {
-      components: { Info, Indicator },
+      components: { Info },
       mounted: function () {
         this.$Spin.show()
         Tools.getData((json) => {
@@ -229,19 +228,20 @@
         searchInput: function (val) {
           if (val) {
             val = val.toLowerCase()
-            console.log(val)
-            this.data = this.originData.filter(function(item) {
-              return ['name','description','user'].some(function(key) {
-                let str = ''
-                if (key === 'user') {
-                  str = String(item['user']['name'])
-                } else {
-                  str = String(item[key])
-                }
-                return str.toLowerCase().indexOf(val) > -1
-              })
-            })
-            console.log(this.data)
+            // console.log(val)
+            // this.data = this.originData.filter(function(item) {
+            //   return ['name','description','user'].some(function(key) {
+            //     let str = ''
+            //     if (key === 'user') {
+            //       str = String(item['user']['name'])
+            //     } else {
+            //       str = String(item[key])
+            //     }
+            //     return str.toLowerCase().indexOf(val) > -1
+            //   })
+            // })
+            this.data = Tools.searcher(this.originData,val)
+            // console.log(this.data)
           } else {
             this.data = this.originData
           }

crx/src/common/js/tools.js

@@ -4,7 +4,7 @@ import iView from 'iview'
 import 'iview/dist/styles/iview.css'    // 使用 CSS
 import 'animate.css'
 import VueI18n from 'vue-i18n'
-import localeMessage from './common/js/locale'
+import localeMessage from '../../src/common/js/locale'
 
 Vue.locale = (locale) => {
 

crx/src/common/lang/en-US.js

@@ -19,6 +19,7 @@ export default {
     closeDonate: 'Close Donate',
     feedback: 'Feedback',
     close: 'No longer show',
-    scriptInstalling: 'Script installing...'
+    scriptInstalling: 'Script installing...',
+    search: 'Search'
   }
 }