Merge pull request #8 from lanyulei/dev

Dev

src/components/wfd/components/DetailPanel/EndEventDetail.vue

@@ -12,7 +12,6 @@
           :value="model.task"
           :value="model.task"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('task', e)"
           @change="(e) => onChange('task', e)"
         >
         >
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />

src/components/wfd/components/DetailPanel/FlowDetail.vue

@@ -10,7 +10,6 @@
           placeholder="选择流转属性"
           placeholder="选择流转属性"
           :disabled="readOnly"
           :disabled="readOnly"
           :value="model.flowProperties"
           :value="model.flowProperties"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('flowProperties', e)"
           @change="(e) => onChange('flowProperties', e)"
         >
         >
           <el-option label="同意" value="1" />
           <el-option label="同意" value="1" />

src/components/wfd/components/DetailPanel/HandleNodeDetail.vue

@@ -12,7 +12,6 @@
           :value="model.task"
           :value="model.task"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('task', e)"
           @change="(e) => onChange('task', e)"
         >
         >
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
@@ -42,7 +41,6 @@
           :value="model.assignValue"
           :value="model.assignValue"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
           <el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
@@ -57,7 +55,6 @@
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
           <el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
@@ -72,7 +69,6 @@
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option
           <el-option
@@ -92,7 +88,6 @@
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />
           <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />

src/components/wfd/components/DetailPanel/ScriptTaskDetail.vue

@@ -10,7 +10,6 @@
           placeholder="选择任务类型"
           placeholder="选择任务类型"
           :disabled="readOnly"
           :disabled="readOnly"
           :value="model.taskType"
           :value="model.taskType"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('taskType', e)"
           @change="(e) => onChange('taskType', e)"
         >
         >
           <el-option label="任务" value="task" />
           <el-option label="任务" value="task" />
@@ -38,7 +37,6 @@
           :value="model.task"
           :value="model.task"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('task', e)"
           @change="(e) => onChange('task', e)"
         >
         >
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />

src/components/wfd/components/DetailPanel/StartEventDetail.vue

@@ -12,7 +12,6 @@
           :value="model.task"
           :value="model.task"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('task', e)"
           @change="(e) => onChange('task', e)"
         >
         >
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />

src/components/wfd/components/DetailPanel/UserTaskDetail.vue

@@ -12,7 +12,6 @@
           :value="model.task"
           :value="model.task"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('task', e)"
           @change="(e) => onChange('task', e)"
         >
         >
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
           <el-option v-for="(taskValue, taskIndex) in tasks" :key="taskIndex" :label="taskValue.name" :value="taskValue.full_name" />
@@ -42,7 +41,6 @@
           :value="model.assignValue"
           :value="model.assignValue"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
           <el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
@@ -57,7 +55,6 @@
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
           <el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
@@ -72,7 +69,6 @@
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
           :filterable="true"
           :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="department in departments" :key="department.id" :label="department.name===''?department.nickname:department.name" :value="department.id" />
           <el-option v-for="department in departments" :key="department.id" :label="department.name===''?department.nickname:department.name" :value="department.id" />
@@ -86,8 +82,6 @@
           :placeholder="i18n['userTask.assignType.variable.placeholder']"
           :placeholder="i18n['userTask.assignType.variable.placeholder']"
           :disabled="readOnly"
           :disabled="readOnly"
           :multiple="true"
           :multiple="true"
-          :filterable="true"
-          :filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
           @change="(e) => onChange('assignValue', e)"
           @change="(e) => onChange('assignValue', e)"
         >
         >
           <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />
           <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />

src/layout/components/Navbar.vue

@@ -17,7 +17,8 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
         <div class="avatar-wrapper">
           <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
           <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
+          <span style="font-size: 14px; position: relative; bottom: 15px">{{ name }}</span>
+          <i class="el-icon-caret-bottom" style="position: absolute; top: 13px" />
         </div>
         </div>
         <el-dropdown-menu slot="dropdown">
         <el-dropdown-menu slot="dropdown">
           <router-link to="/profile/index">
           <router-link to="/profile/index">
@@ -52,7 +53,8 @@ export default {
     ...mapGetters([
     ...mapGetters([
       'sidebar',
       'sidebar',
       'avatar',
       'avatar',
-      'device'
+      'device',
+      'name'
     ])
     ])
   },
   },
   methods: {
   methods: {