Unverified Commit db772438 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge branch 'dev' into dev

parents 59c9649f 33658d57

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
        <m-list-box-f v-if="isADMIN">

          <template slot="name"><strong>*</strong>{{$t('Tenant')}}</template>

          <template slot="content">

            <x-select v-model="tenantId">

            <x-select v-model="tenantId" style="width: 100%;">

              <x-option

                      v-for="city in tenantList"

                      :key="city.id"
@@ -59,7 +59,7 @@ 
        <m-list-box-f v-if="isADMIN">

          <template slot="name">{{$t('Queue')}}</template>

          <template slot="content">

            <x-select v-model="queueName">

            <x-select v-model="queueName" style="width: 100%;">

              <x-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a queue')" :value="selectedModel ? selectedModel.label : ''" @on-click-icon.stop="queueName = ''">

                <em slot="suffix" class="ans-icon-fail-solid" style="font-size: 15px;cursor: pointer;" v-show="queueName ==''"></em>

                <em slot="suffix" class="ans-icon-arrow-down" style="font-size: 12px;" v-show="queueName!=''"></em>