From ffa244c074b77a914713629dc25e8d3a38a87c0a Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 5 Sep 2022 09:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA=E5=B1=82?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F/=E6=89=A9=E5=A4=A7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E5=AD=97=E6=95=B0=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA...=E6=98=BE=E7=A4=BA/=E9=BC=A0=E6=A0=87=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E6=98=BE=E7=A4=BA=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?/=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/member/MemberAdd.vue                | 15 +++++++++++++++
 .../src/views/role/RoleUpdate.vue                 |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/views/member/MemberAdd.vue b/com.actionsoft.apps.coe.pal.cooperation/src/views/member/MemberAdd.vue
index 949e92d..ac75d97 100644
--- a/com.actionsoft.apps.coe.pal.cooperation/src/views/member/MemberAdd.vue
+++ b/com.actionsoft.apps.coe.pal.cooperation/src/views/member/MemberAdd.vue
@@ -15,6 +15,11 @@
                     <awsui-form ref="form" :model="form" label-position="top" style="padding:0 5px">
                         <div class="awsui-form-item">
                             <label class="awsui-form-item__label">成员</label>
+
+                            <el-input size="mini" placeholder="请输入成员" v-model="searchUserName" class="input-with-select">
+                                <el-button slot="append" icon="el-icon-search" @click="searchUserNameFun"></el-button>
+                            </el-input>
+
                             <div v-if="isOlderVersion" class="awsui-form-item__content">
                                 <awsui-select filterable v-model="form.userArr" :options="form.userOpts" multiple size="large" key="user"></awsui-select>
                             </div>
@@ -32,6 +37,7 @@
                                       @node-click="openNode"
                                       @node-expand="expandNode"
                                       @node-collapse="closeNode"
+                                      :filter-node-method="filterNode"
                                       node-key="id"
                                       lazy
                                       :load="loadNode">
@@ -91,6 +97,7 @@
                 default: ''
             }
         },
+
         data() {
             return {
                 dialogVisible: false,
@@ -116,6 +123,7 @@
                 addressType: 'user',
                 highSecurityFilter: 'sysAdmin,auditor' ,// 例如值为sysAdmin,auditor，则开启三员之后该地址簿不显示系统管理员和安全审计员
                 pid: '',
+                searchUserName:''
 
             }
         },
@@ -315,6 +323,13 @@
                 console.log(error);
               })
             },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data.name.indexOf(value) !== -1;
+            },
+            searchUserNameFun(){
+                this.$refs.tree.filter(this.searchUserName);
+            },
         },
         watch: {
             visible(val) {
diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue b/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
index 9060a0c..19a873b 100644
--- a/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
+++ b/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
@@ -1,6 +1,7 @@
 <template>
     <div>
         <awsui-sidebar
+                :size="size"
                 :title="title"
                 :before-close="handleClose"
                 :wrapper-closable=false
@@ -69,7 +70,7 @@
                                       :load="loadNode">
                                         <span slot-scope="{node, data}" style="display: flex;width: 100%">
                                           <i class="awsui-iconfont tree-content-icon tree-content-icon-padding" :style="{'color': node.data.icon.color}" v-html="node.data.icon.icon"></i>
-                                          <span style="max-width:150px;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">{{node.label}}</span>
+                                          <span :title="node.label" style="max-width:250px;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">{{node.label}}</span>
                                           <span v-if="node.level > 1" class="action-checkBox" style="flex: 1;text-align: right" @click="handleCheckedActionChange(node)">
                                             <el-checkbox-group  v-model="node.data.dataActionPerm">
                                               <el-checkbox v-for="dataAction in node.data.dataActionPermOpts" :label="dataAction.label" :key="dataAction.label"
@@ -128,6 +129,7 @@
                 :selected="JSON.parse(JSON.stringify(roleForm.dataPerm))"
         />
     </div>
+
 </template>
 
 <script>
@@ -165,6 +167,7 @@
                 sidebarVisible: false,
                 buttonDisabled: false,
                 title: '新增角色',
+                size: '80%',
                 drawerBodyHeight: '0px',
                 footerHeight: '50px',
                 wsId: '',
@@ -206,6 +209,7 @@
                 checkAllUpdate: false,
                 checkAllDelete: false,
                 checkAllVersion: false,
+
             }
         },
         mounted() {