Browse Source

Merge pull request #354 from qiaozhanwei/branch-1.0.2

creating a user queue is not required
pull/2/head
乔占卫 5 years ago committed by GitHub
parent
commit
9ab399e909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
  2. 3
      escheduler-ui/src/js/module/i18n/locale/zh_CN.js

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

@ -40,9 +40,13 @@
</template>
</m-list-box-f>
<m-list-box-f v-if="isADMIN">
<template slot="name"><b>*</b>{{$t('Queue')}}</template>
<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 = {}">
<i slot="suffix" class="fa fa-times-circle" style="font-size: 15px;cursor: pointer;" v-show="queueName.id"></i>
<i slot="suffix" class="ans-icon-arrow-down" style="font-size: 12px;" v-show="!queueName.id"></i>
</x-input>
<x-option
v-for="city in queueList"
:key="city.id"

3
escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -455,5 +455,6 @@ export default {
'Post Statement': '后置sql',
'Statement cannot be empty': '语句不能为空',
'Process Define Count': '流程定义个数',
'Process Instance Running Count': '运行流程实例个数'
'Process Instance Running Count': '运行流程实例个数',
'Please select a queue': '请选择队列',
}

Loading…
Cancel
Save