From 7cfc771d3ace8f057ef7f534b9ee7c9649ac7d8f Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期四, 30 十二月 2021 10:09:25 +0800 Subject: [PATCH] [Fix] TODO#133359 [調整文案 - 「你」調整成「您」] --- PAMapp/components/multiSelectBtn.vue | 78 ++++++++++++++++++++++++--------------- 1 files changed, 48 insertions(+), 30 deletions(-) diff --git a/PAMapp/components/multiSelectBtn.vue b/PAMapp/components/multiSelectBtn.vue index da017ba..d7d5fe4 100644 --- a/PAMapp/components/multiSelectBtn.vue +++ b/PAMapp/components/multiSelectBtn.vue @@ -5,19 +5,19 @@ v-for="(option, index) in options" :key="index" :label="option.label"> - {{option.title}} + {{ option.title }} </el-checkbox> <template v-if="nameOfSelectAll"> - <button class="pam-selectAll-btn cursor--pointer" :class="{'selected':isSelectAll}" :model="isSelectAll" @click="selectAll"> + <button class="pam-selectAll-btn cursor--pointer fix-chrome-click--issue" :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 class="pam-selectAll-btn cursor--pointer fix-chrome-click--issue" :class="{'selected':isSelectOtherOption}" :model="isSelectOtherOption" @click="selectOther"> + {{ nameOfOtherOption }} </button> <div> - <input class="pam-muti-select-other cursor--pointer" v-if="isSelectOtherOption" v-model="syncOtherSelect" placeholder="隢撓�,���20摮�"> + <input class="pam-muti-select-other cursor--pointer " v-if="isSelectOtherOption" v-model="syncOtherSelect" placeholder="隢撓�,���20摮�"> </div> </template> </el-checkbox-group> @@ -26,30 +26,47 @@ <script lang="ts"> import { Vue, Component, Prop, PropSync} from 'vue-property-decorator'; - import { OptionBtnDto } from './singleSelectBtn.vue'; +import { OptionBtnDto } from '~/shared/models/optionBtnDto.model'; @Component export default class MultiSelectBtn extends Vue { - @PropSync('mutiSelect',{type:Array,default:()=>[]}) syncMutiSelect!:string[]; - @Prop({default:()=>[]}) options!:OptionBtnDto[]; - @Prop({default:''}) nameOfSelectAll!:string; - @PropSync('otherSelect',{default:''}) syncOtherSelect!:string; - @Prop({type:String,default:''}) nameOfOtherOption!:string; + + @PropSync('mutiSelect',{type:Array,default:()=>[]}) + syncMutiSelect!:string[]; + + @Prop({default:()=>[]}) + options!:OptionBtnDto[]; + + @Prop({default:''}) + nameOfSelectAll!:string; + + @PropSync('otherSelect',{default:''}) + syncOtherSelect!:string; + + @Prop({type:String,default:''}) + nameOfOtherOption!:string; + isSelectOtherOption=false; isSelectAll=false; + + ////////////////////////////////////////////////////////////////////// updated() { this.isSelectAll = this.syncMutiSelect.length === this.options.length; } - selectAll():void{ + ////////////////////////////////////////////////////////////////////// + + selectAll():void { this.isSelectAll= !this.isSelectAll; this.syncMutiSelect = this.isSelectAll ? this.optionsFormat(this.options):[]; } - optionsFormat(optios:OptionBtnDto[]):string[]{ - return optios.map(o=>o.title); + + optionsFormat(options:OptionBtnDto[]): string[] { + return options.map((option)=> option.title ); } - selectOther():void{ + + selectOther(): void { this.isSelectOtherOption = !this.isSelectOtherOption; if(!this.isSelectOtherOption){ this.syncOtherSelect = ''; @@ -60,25 +77,26 @@ <style lang="scss" scoped> .pam-selectAll-btn{ - padding: 6px 20px; - border: 1px $LIGHT_GREY solid; + padding : 6px 20px; + border : 1px $LIGHT_GREY solid; background-color: $PRIMARY_WHITE; - border-radius: 30px; - font-size: 20px; - margin-right: 10px; - margin-bottom: 10px; + border-radius : 30px; + color : $PRIMARY_BLACK; + font-size : 20px; + margin-right : 10px; + margin-bottom : 10px; &.selected{ - background-color:$CORAL; - color: $PRIMARY_WHITE; + background-color: $CORAL; + 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; + 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