fix: 组织架构选择器不使用 fe_list_department_profiles API (#1624)

TencentBlueKing · Sep 24, 2024 · bbcb4a2 · bbcb4a2
1 parent 9c59460
commit bbcb4a2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/webfe/package_vue/src/components/user-selector/index.vue b/webfe/package_vue/src/components/user-selector/index.vue
@@ -212,6 +212,8 @@ export default {
       ],
       searchConditionValue: 'fuzzy',
       isConfirmLoading: false,
+      userApi: '',
+      departmentApi: '',
     };
   },
   computed: {
@@ -283,9 +285,8 @@ export default {
     },
     apiHost: {
       handler(value) {
-        this.userApi = `${value}/api/c/compapi/v2/usermanage/fe_list_department_profiles/`;
+        this.userApi = `${value}/api/c/compapi/v2/usermanage/fs_list_users/`;
         this.departmentApi = `${value}/api/c/compapi/v2/usermanage/fe_list_departments/`;
-        this.userSearchApi = `${value}/api/c/compapi/v2/usermanage/fe_list_users/`;
       },
       immediate: true,
     },
@@ -312,7 +313,7 @@ export default {
     },
 
     fetchSearchUser(params = {}) {
-      return request.getData(this.userSearchApi, params);
+      return request.getData(this.userApi, params);
     },
 
     async fetchCategories(isTreeLoading = false, isDialogLoading = false) {
@@ -504,7 +505,7 @@ export default {
       };
       const requestUserParams = {
         ...params,
-        lookup_value: payload.id,
+        extra_lookups: payload.id,
       };
 
       try {

diff --git a/webfe/package_vue/src/components/user-selector/request.js b/webfe/package_vue/src/components/user-selector/request.js
@@ -28,7 +28,7 @@ function JSONP(api, params = {}, options = {}) {
       resolve(response);
     };
     const script = document.createElement('script');
-    script.onerror = (event) => {
+    script.onerror = () => {
       document.body.removeChild(script);
       delete window[callbackName];
       reject('Get data failed.');
@@ -57,7 +57,7 @@ const request = {
       if (response.code !== 0) {
         throw new Error(response);
       }
-      data = response.data;
+      data = Array.isArray(response.data) ? response.data : response.data.results;
     } catch (error) {
       console.error(error.message);
       data = [];

diff --git a/webfe/package_vue/src/views/dev-center/app/market/render-member-list.vue b/webfe/package_vue/src/views/dev-center/app/market/render-member-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="render-member-list-wrapper">
+  <div :class="['render-member-list-wrapper', { 'default-style': !customStyles }]">
     <div class="content">
       <div
         v-for="(item, index) in data"
@@ -38,11 +38,22 @@ export default {
       type: String,
       default: 'user',
     },
+    customStyles: {
+      type: String,
+      default: false,
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
 .render-member-list-wrapper {
+  &.default-style {
+    margin-top: 12px;
+    padding: 12px 12px 12px 36px;
+    background: #f5f7fa;
+    border-radius: 2px;
+  }
+  font-size: 12px;
   color: #63656e;
   .content {
     .icon {

diff --git a/webfe/package_vue/src/views/dev-center/app/market/visible-range.vue b/webfe/package_vue/src/views/dev-center/app/market/visible-range.vue
@@ -34,10 +34,12 @@
           <render-member-list
             v-if="departments.length > 0"
             type="department"
+            :custom-styles="true"
             :data="departments"
           />
           <render-member-list
             v-if="users.length > 0"
+            :custom-styles="true"
             :data="users"
           />
         </div>