From f4229272d94690403c1b1f516f6e7378cc86c708 Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期五, 12 十一月 2021 10:01:57 +0800
Subject: [PATCH] [ Update ] 微調嚴選配對 UI,新增 單選、複選 共用元件,嚴選配對api 完成

---
 PAMapp/components/multiSelectBtn.vue |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/PAMapp/components/multiSelectBtn.vue b/PAMapp/components/multiSelectBtn.vue
index af57166..da017ba 100644
--- a/PAMapp/components/multiSelectBtn.vue
+++ b/PAMapp/components/multiSelectBtn.vue
@@ -4,13 +4,21 @@
       <el-checkbox
         v-for="(option, index) in options"
         :key="index"
-        :label="option"
-        :name="option"
-      ></el-checkbox>
+        :label="option.label">
+          {{option.title}}
+        </el-checkbox>
       <template v-if="nameOfSelectAll">
         <button class="pam-selectAll-btn cursor--pointer" :class="{'selected':isSelectAll}" :model="isSelectAll" @click="selectAll">
          <span>{{nameOfSelectAll}}</span>
        </button>
+      </template>
+      <template v-if="nameOfOtherOption">
+        <button class="pam-selectAll-btn cursor--pointer" :class="{'selected':isSelectOtherOption}" :model="isSelectOtherOption" @click="selectOther">
+         <span>{{nameOfOtherOption}}</span>
+        </button>
+        <div>
+          <input class="pam-muti-select-other cursor--pointer" v-if="isSelectOtherOption" v-model="syncOtherSelect" placeholder="隢撓�,���20摮�">
+        </div>
       </template>
     </el-checkbox-group>
   </div>
@@ -18,12 +26,16 @@
 
 <script lang="ts">
   import { Vue, Component, Prop, PropSync} from 'vue-property-decorator';
+  import { OptionBtnDto } from './singleSelectBtn.vue';
 
   @Component
   export default class MultiSelectBtn extends Vue {
     @PropSync('mutiSelect',{type:Array,default:()=>[]}) syncMutiSelect!:string[];
+    @Prop({default:()=>[]}) options!:OptionBtnDto[];
     @Prop({default:''}) nameOfSelectAll!:string;
-    @Prop({default:()=>[]}) options!:string[]|[];
+    @PropSync('otherSelect',{default:''}) syncOtherSelect!:string;
+    @Prop({type:String,default:''}) nameOfOtherOption!:string;
+    isSelectOtherOption=false;
     isSelectAll=false;
 
     updated() {
@@ -32,9 +44,17 @@
 
     selectAll():void{
       this.isSelectAll= !this.isSelectAll;
-      this.syncMutiSelect = this.isSelectAll ? this.options:[];
+      this.syncMutiSelect = this.isSelectAll ? this.optionsFormat(this.options):[];
     }
-
+    optionsFormat(optios:OptionBtnDto[]):string[]{
+      return optios.map(o=>o.title);
+    }
+    selectOther():void{
+      this.isSelectOtherOption = !this.isSelectOtherOption;
+      if(!this.isSelectOtherOption){
+        this.syncOtherSelect = '';
+      }
+    }
   }
 </script>
 
@@ -52,4 +72,13 @@
       color: $PRIMARY_WHITE;
     }
   }
+  .pam-muti-select-other {
+    height: 50px;
+    padding: 5px;
+    -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+    -moz-box-sizing: border-box;    /* Firefox, other Gecko */
+    box-sizing: border-box;
+    width: 316px;
+    border: 1px solid #CCCCCC;
+  }
 </style>

--
Gitblit v1.8.0