修复首次安装扩展后设置按钮没显示问题

goulmdiy · Nov 2, 2018 · cb1c1a7 · cb1c1a7
1 parent c36d107
commit cb1c1a7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/front/src/i18n/en-US.js b/front/src/i18n/en-US.js
@@ -83,7 +83,8 @@ export default {
     extCenter: 'Extension center',
     installLocalExt: 'Install local extension',
     installOk: 'Installed successfully',
-    installErr: 'Installation failed, please check the manifest.json file'
+    installErr: 'Installation failed, please check the manifest.json file',
+    setting: 'Setting'
   },
   setting: {
     downSetting: 'Download settings',

diff --git a/front/src/i18n/zh-TW.js b/front/src/i18n/zh-TW.js
@@ -83,7 +83,8 @@ export default {
     extCenter: '擴充中心',
     installLocalExt: '加載本地擴充',
     installOk: '加載成功',
-    installErr: '加載失敗，請檢查manifest.json文件'
+    installErr: '加載失敗，請檢查manifest.json文件',
+    setting: '預設'
   },
   setting: {
     downSetting: '下載設定',

diff --git a/front/src/views/Extension.vue b/front/src/views/Extension.vue
@@ -61,7 +61,7 @@
         <Table :columns="localColumns"
           :data="localAllList"></Table>
         <Modal v-model="settingModal"
-          title="设置">
+          :title="$t('extension.setting')">
           <ExtensionSetting :settings="settings" />
           <span slot="footer">
             <Button @click="settingModal = false">{{ $t('tip.cancel') }}</Button>
@@ -303,7 +303,9 @@ export default {
               row.meta = { path: row.meta.path, enabled: true }
               this.localAllList.push(row)
             }
-            this.refreshExtensions()
+            this.getLocalExtensions(() => {
+              this.refreshExtensions()
+            })
             this.spinShow = false
             this.$Message.success({
               content: this.$t('extension.downloadOk'),
@@ -386,16 +388,23 @@ export default {
         }
       })
     },
-    loadExtensions() {
-      // Loading proxy mode
-      getProxyMode().then(mode => (this.proxySwitch = mode === 1))
-      // Get local installed extension
+    getLocalExtensions(callback) {
       getExtensions().then(localAllList => {
         this.localAllList = localAllList
         this.localAllList.forEach(localExt => {
           localExt.installed = true
           localExt.currVersion = localExt.version
         })
+        if (callback) {
+          callback()
+        }
+      })
+    },
+    loadExtensions() {
+      // Loading proxy mode
+      getProxyMode().then(mode => (this.proxySwitch = mode === 1))
+      // Get local installed extension
+      this.getLocalExtensions(() => {
         this.searchExtensions()
       })
     },
@@ -417,6 +426,7 @@ export default {
           this.$set(onlineExt, 'installed', true)
           this.$set(onlineExt, 'currVersion', localExt.version)
           this.$set(onlineExt, 'meta', localExt.meta)
+          this.$set(onlineExt, 'settings', localExt.settings)
         } else {
           onlineExt.installed = false
           onlineExt.meta = { path: onlineExt.path, enabled: false }