From d0e639853ec663bb0899a4b52f684f84d186f6f2 Mon Sep 17 00:00:00 2001
From: wuxuesong <wu-xuesong@qq.com>
Date: Tue, 16 Apr 2019 15:40:07 +0800
Subject: [PATCH] fix select2

---
 src/components/FormSelect2.vue | 101 ++++++++++++---------------------
 src/i18n/en-US.json            |   3 +-
 src/i18n/zh-CN.json            |   3 +-
 src/scss/style.scss            |   4 +-
 4 files changed, 42 insertions(+), 69 deletions(-)

diff --git a/src/components/FormSelect2.vue b/src/components/FormSelect2.vue
index 2c35ac8..13a06fe 100644
--- a/src/components/FormSelect2.vue
+++ b/src/components/FormSelect2.vue
@@ -5,7 +5,9 @@
     label="text"
     :options="newOptions"
     :multiple="multiple"
-  ></v-select>
+  >
+  <div slot="no-options">{{noOptionsText}}</div>
+  </v-select>
 </template>
 
 <script>
@@ -33,15 +35,21 @@ export default {
     multiple: {},
     field: {},
     parent: {},
-    ajaxOptions: {}
+    ajaxOptions: {},
+    noOptionsText: {
+      default(){
+        return this.$t('messages.no_options_text')
+      }
+    },
+    q: ''
   },
   computed: {
     model: {
       get() {
         if (this.multiple) {
-          return this.options.filter(v => this.value.includes(v.value));
+          return this.newOptions.filter(v => this.value.includes(v.value));
         } else {
-          return this.options.find(v => this.value === v.value);
+          return this.newOptions.find(v => this.value === v.value);
         }
       },
       set(val) {
@@ -60,51 +68,8 @@ export default {
   },
   methods: {
     getAjaxOptions(q) {
-      if (!this.ajaxOptions) {
-        return;
-      }
-
-      const options = this.ajaxOptions;
-      if (options.url) {
-        const url = _.template(options.url)({ item: parent });
-        const fetchOptions = (params = {}) => {
-          console.log(params);
-          this.$http
-            .get(url, {
-              params: params
-            })
-            .then(res => {
-              this.newOptions = res.data;
-            })
-            .catch(console.log);
-        };
-        if (options.depends) {
-          this.$watch(
-            `parent.${options.depends}`,
-            val => {
-              fetchOptions({ [options.depends]: val });
-            },
-            {
-              // deep: true,
-              immediate: true
-            }
-          );
-        } else {
-          fetchOptions();
-        }
-        return;
-      }
-      if (!options.where) {
-        options.where = {};
-      }
-      options.where[options.text] = q;
-      this.$http
-        .get(options.resource + "/options", {
-          params: options
-        })
-        .then(({ data }) => {
-          this.newOptions = data;
-        });
+      this.q = q
+      this.fetchOptions()
     },
     initOptionsForSelect2() {
       const parentOptions = this.parent[this.name + "_data"];
@@ -112,37 +77,41 @@ export default {
         this.newOptions = this.options.concat(parentOptions);
       }
     },
-    fetchOptions(query) {
+    fetchOptions(query = {}) {
       const params = this.ajaxOptions;
       const { url, resource, where = {}, text, depends } = params;
-      if (!params.where) {
-        params.where = {};
+      params.where = Object.assign({}, where, query);
+      if (text) {
+        options.where[text] = this.q;
       }
-      // if (text) {
-      //   options.where[text] = q;
-      // }
       const apiUrl = url
         ? _.template(url)({ item: this.parent })
         : resource + "/options";
       this.$http.get(apiUrl, { params }).then(({ data }) => {
+        this.model = { value: null };
         this.newOptions = data;
       });
     }
   },
   mounted() {
     if (this.ajaxOptions) {
-      this.fetchOptions();
+      
       const { url, resource, where, depends } = this.ajaxOptions;
-      this.$watch(
-        `parent.${depends}`,
-        val => {
-          this.fetchOptions({ [depends]: val });
-        },
-        {
-          // deep: true,
-          immediate: true
-        }
-      );
+      if (depends) {
+        this.$watch(
+          `parent.${depends}`,
+          val => {
+            console.log(val)
+            this.fetchOptions({ [depends]: val });
+          },
+          {
+            // deep: true,
+            immediate: true
+          }
+        );
+      } else {
+        this.fetchOptions();
+      }
     }
   }
 };
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index 5bfdea6..d01b44c 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -9,7 +9,8 @@
     "deleted_all": "All deleted",
     "confirm_delete": "Are you sure you want to delete?",
     "image_size": "Size limit: {width}x{height}",
-    "confirm_delete_all": "Are you sure you want to delete all data?"    
+    "confirm_delete_all": "Are you sure you want to delete all data?",
+    "no_options_text": "No Options Here!"
   },
   "errors": {
 
diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json
index a3f5f4d..2a7ecfb 100644
--- a/src/i18n/zh-CN.json
+++ b/src/i18n/zh-CN.json
@@ -51,7 +51,8 @@
     "deleted_all": "全部删除成功",
     "confirm_delete": "确定要删除吗？",
     "image_size": "尺寸要求：{width}x{height}",
-    "confirm_delete_all": "此次操作不可恢复，确定要全部删除吗？"
+    "confirm_delete_all": "此次操作不可恢复，确定要全部删除吗？",
+    "no_options_text": "暂无可选项"
   },
   "errors": {
     "too_large": "请上传小于{limit}KB的文件",
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 64fa02a..6437500 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -7,7 +7,9 @@
 // Custom styles
 // @import "custom";
 // @import "skin";
-
+*{
+  outline: none;
+}
 .card {
   // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
 }