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

Merge pull request #2618 from samz406/57 

modify the prompt message when the user does not select the queue
parents 697ea0f6 d20e1f95

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
          <template slot="name">{{$t('Queue')}}</template>

          <template slot="content">

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

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

              <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>

              </x-input>

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ export default { 
  'Tenant Code': 'Tenant Code',

  'Tenant Name': 'Tenant Name',

  Queue: 'Queue',

  'Please select a queue': 'Please select a queue',

  'Please select a queue': 'default is tenant association queue',

  'Please enter the tenant code in English': 'Please enter the tenant code in English',

  'Please enter tenant code in English': 'Please enter tenant code in English',

  'Edit User': 'Edit User',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ export default { 
  'Statement cannot be empty': '语句不能为空',

  'Process Define Count': '工作流定义数',

  'Process Instance Running Count': '正在运行的流程数',

  'Please select a queue': '请选择队列',

  'Please select a queue': '默认为租户关联队列',

  'command number of waiting for running': '待执行的命令数',

  'failure command number': '执行失败的命令数',

  'tasks number of waiting running': '待运行任务数',