diff --git a/src/pages/src/components/field-mapping/FieldMapping.vue b/src/pages/src/components/field-mapping/FieldMapping.vue
index fe27533d3..149b09341 100644
--- a/src/pages/src/components/field-mapping/FieldMapping.vue
+++ b/src/pages/src/components/field-mapping/FieldMapping.vue
@@ -2,9 +2,9 @@
   <div>
     <div class="field-mapping">
       <div class="field-title">
-        <bk-form-item class="w-[240px]" :label="$t('用户管理字段')" required />
+        <bk-form-item class="w-[240px]" :label="sourceField" required />
         <bk-form-item class="w-[100px]" :label="$t('映射关系')" />
-        <bk-form-item class="w-[240px]" :label="$t('API返回字段')" required />
+        <bk-form-item class="w-[240px]" :label="targetField" required />
       </div>
       <div class="field-content" v-for="(item, index) in fieldSettingData?.field_mapping?.builtin_fields" :key="index">
         <div class="field-name">
@@ -29,6 +29,7 @@
           <bk-select
             class="w-[240px]"
             v-model="item.source_field"
+            :disabled="disabledBuiltinField"
             @change="(val, oldVal) => emit('changeApiFields', val, oldVal)">
             <bk-option
               v-for="option in apiFields"
@@ -96,7 +97,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { defineEmits, defineProps, ref } from 'vue';
 
 import { t } from '@/language/index';
 
@@ -113,6 +114,18 @@ defineProps({
     type: Object,
     default: () => ({}),
   },
+  sourceField: {
+    type: String,
+    default: '',
+  },
+  targetField: {
+    type: String,
+    default: '',
+  },
+  disabledBuiltinField: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['changeApiFields', 'handleAddField', 'handleDeleteField', 'changeCustomField']);
diff --git a/src/pages/src/http/settingFiles.ts b/src/pages/src/http/settingFiles.ts
index ead3801a9..8a5b7e192 100644
--- a/src/pages/src/http/settingFiles.ts
+++ b/src/pages/src/http/settingFiles.ts
@@ -1,6 +1,8 @@
 import http from './fetch';
 import type {
+  FromStrategiesConfirmParams,
   NewCustomFieldsParams,
+  NewToStrategiesParams,
   PatchBuiltinManagerParams,
   PutCustomFieldsParams,
   PutPasswordParams,
@@ -84,3 +86,53 @@ export const getTenantInfo = () => http.get('/api/v1/web/tenant-info/');
  * 基础设置-更新租户
  */
 export const PutTenantInfo = (params: PutTenantInfoParams) => http.put('/api/v1/web/tenant-info/', params);
+
+/**
+ * 跨租户协同-我分享的协同策略
+ */
+export const getToStrategies = () => http.get('/api/v1/web/collaboration/to-strategies/');
+
+/**
+ * 跨租户协同-我分享的协同策略切换状态
+ */
+export const putToStrategiesStatus = (id: number) => http.put(`/api/v1/web/collaboration/to-strategies/${id}/source-status/`);
+
+/**
+ * 跨租户协同-新建协同策略
+ */
+export const postToStrategies = (params: NewToStrategiesParams) => http.post('/api/v1/web/collaboration/to-strategies/', params);
+
+/**
+ * 跨租户协同-更新协同策略
+ */
+export const putToStrategies = (id: number, params: NewToStrategiesParams) => http.put(`/api/v1/web/collaboration/to-strategies/${id}/`, params);
+
+/**
+ * 跨租户协同-删除协同策略
+ */
+export const deleteToStrategies = (id: number) => http.delete(`/api/v1/web/collaboration/to-strategies/${id}/`);
+
+/**
+ * 跨租户协同-我接受的协同策略
+ */
+export const getFromStrategies = () => http.get('/api/v1/web/collaboration/from-strategies/');
+
+/**
+ * 跨租户协同-我接受的协同策略切换状态
+ */
+export const putFromStrategiesStatus = (id: number) => http.put(`/api/v1/web/collaboration/from-strategies/${id}/target-status/`);
+
+/**
+ * 跨租户协同-源租户自定义字段
+ */
+export const getSourceTenantCustomFields = (id: number) => http.get(`/api/v1/web/collaboration/from-strategies/${id}/source-tenant-custom-fields/`);
+
+/**
+ * 跨租户协同-确认协同策略
+ */
+export const putFromStrategiesConfirm = (params: FromStrategiesConfirmParams) => http.put(`/api/v1/web/collaboration/from-strategies/${params.id}/operations/confirm/`, params);
+
+/**
+ * 跨租户协同-编辑协同策略
+ */
+export const putFromStrategies = (params: FromStrategiesConfirmParams) => http.put(`/api/v1/web/collaboration/from-strategies/${params.id}/`, params);
diff --git a/src/pages/src/http/types/settingFiles.ts b/src/pages/src/http/types/settingFiles.ts
index b2560b7dd..f07d1f2ab 100644
--- a/src/pages/src/http/types/settingFiles.ts
+++ b/src/pages/src/http/types/settingFiles.ts
@@ -79,3 +79,33 @@ export interface PutTenantInfoParams {
   visible: boolean,
   user_number_visible: boolean,
 }
+
+/**
+ * 跨租户协同-新建协同策略
+ */
+export interface NewToStrategiesParams {
+  name: string,
+  target_tenant_id: string,
+  source_config: {
+    organization_scope_type: string,
+    organization_scope_config: object,
+    field_scope_type: string,
+    field_scope_config: object,
+  },
+}
+
+/**
+ * 跨租户协同-确认协同策略
+ */
+export interface FromStrategiesConfirmParams {
+  id: number,
+  target_config: {
+    organization_scope_type: string,
+    organization_scope_config: object,
+    field_mapping: {
+      source_field: string,
+      mapping_operation: string,
+      target_field: string,
+    }[],
+  },
+}
diff --git a/src/pages/src/language/en.json b/src/pages/src/language/en.json
index 1a8d40275..69cc27d33 100644
--- a/src/pages/src/language/en.json
+++ b/src/pages/src/language/en.json
@@ -419,7 +419,6 @@
   "租户logo": "Tenant Logo",
   "我分享的": "Shared by Me",
   "其他租户分享的": "Shared by Other Tenants",
-  "目标公司": "Target company",
   "确认": "Confirm",
   "数据变更记录": "Data Change Logs",
   "重置": "Reset",
@@ -463,5 +462,13 @@
   "是否启用管理员账号？": "Enable Administrator Account?",
   "停用后，将不可使用管理员账号进行登录": "After deactivation, the administrator account cannot be used for logging in",
   "停用后，可使用管理员账号进行登录": "After deactivation, the administrator account can still be used for logging in",
-  "当前还没有数据源，需要先选择数据源类型并进行配置": "There is currently no data source; you need to select a data source type and configure it first"
+  "当前还没有数据源，需要先选择数据源类型并进行配置": "There is currently no data source; you need to select a data source type and configure it first",
+  "搜索策略名称": "Search Strategy Name",
+  "协同策略创建成功": "Collaboration Strategy Created Successfully",
+  "协同策略更新成功": "Collaboration Strategy Updated Successfully",
+  "所有部门 + 用户": "All departments + Users",
+  "协同数据选择": "Select Collaboration Data",
+  "已协同": "Already collaborated",
+  "源租户用户字段": "Source tenant user fields",
+  "本租户用户字段": "This tenant's user fields"
 }
\ No newline at end of file
diff --git a/src/pages/src/language/zh.json b/src/pages/src/language/zh.json
index dcf44e288..bb51a233b 100644
--- a/src/pages/src/language/zh.json
+++ b/src/pages/src/language/zh.json
@@ -419,7 +419,6 @@
   "租户logo": "租户logo",
   "我分享的": "我分享的",
   "其他租户分享的": "其他租户分享的",
-  "目标公司": "目标公司",
   "确认": "确认",
   "数据变更记录": "数据变更记录",
   "重置": "重置",
@@ -463,5 +462,13 @@
   "是否启用管理员账号？": "是否启用管理员账号？",
   "停用后，将不可使用管理员账号进行登录": "停用后，将不可使用管理员账号进行登录",
   "停用后，可使用管理员账号进行登录": "停用后，可使用管理员账号进行登录",
-  "当前还没有数据源，需要先选择数据源类型并进行配置": "当前还没有数据源，需要先选择数据源类型并进行配置"
+  "当前还没有数据源，需要先选择数据源类型并进行配置": "当前还没有数据源，需要先选择数据源类型并进行配置",
+  "搜索策略名称": "搜索策略名称",
+  "协同策略创建成功": "协同策略创建成功",
+  "协同策略更新成功": "协同策略更新成功",
+  "所有部门 + 用户": "所有部门 + 用户",
+  "协同数据选择": "协同数据选择",
+  "已协同": "已协同",
+  "源租户用户字段": "源租户用户字段",
+  "本租户用户字段": "本租户用户字段"
 }
\ No newline at end of file
diff --git a/src/pages/src/utils/index.ts b/src/pages/src/utils/index.ts
index f7cde29d9..6f405b4df 100644
--- a/src/pages/src/utils/index.ts
+++ b/src/pages/src/utils/index.ts
@@ -97,6 +97,10 @@ export const dataSourceStatus = {
     icon: warningImg,
     text: t('待确认'),
   },
+  unconfirmed: {
+    icon: warningImg,
+    text: t('待确认'),
+  },
 };
 
 export const validTime = {
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
index 4552960e0..bf8583352 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
@@ -12,8 +12,12 @@
           <bk-form-item class="w-[590px]" :label="$t('策略名称')" property="name" required>
             <bk-input v-model="formData.name" :placeholder="validate.name.message" @focus="handleChange" />
           </bk-form-item>
-          <bk-form-item class="w-[590px]" :label="$t('目标公司')" property="name" required>
-            <bk-input v-model="formData.name" :placeholder="validate.name.message" @focus="handleChange" />
+          <bk-form-item class="w-[590px]" :label="$t('目标租户')" property="target_tenant_id" required>
+            <bk-input
+              v-model="formData.target_tenant_id"
+              :placeholder="validate.name.message"
+              :disabled="config.type === 'edit'"
+              @focus="handleChange" />
           </bk-form-item>
         </div>
       </div>
@@ -35,11 +39,11 @@
         <div class="operation-content-info flex">
           <bk-form-item class="w-[350px]" :label="$t('同步范围')" required>
             <bk-radio-group
-              v-model="formData.sync_type"
+              v-model="formData.source_config.field_scope_type"
             >
               <bk-radio label="all">{{ $t('所有字段') }}</bk-radio>
-              <!-- <bk-radio label="appoint">{{ $t('指定字段') }}</bk-radio>
-              <bk-radio label="basics">{{ $t('仅基础字段') }}</bk-radio> -->
+              <bk-radio label="appoint" disabled>{{ $t('指定字段') }}</bk-radio>
+              <bk-radio label="basics" disabled>{{ $t('仅基础字段') }}</bk-radio>
             </bk-radio-group>
           </bk-form-item>
           <bk-form-item
@@ -63,7 +67,8 @@
             </bk-select>
           </bk-form-item>
         </div>
-        <div class="operation-content-info mt-[24px]">
+        <!-- 一期不做 -->
+        <!-- <div class="operation-content-info mt-[24px]">
           <bk-form-item class="w-[800px]" :label="$t('字段预览')">
             <bk-table
               :data="tableData"
@@ -83,11 +88,11 @@
               <bk-table-column prop="organization" :label="$t('组织')" />
             </bk-table>
           </bk-form-item>
-        </div>
+        </div> -->
       </div>
     </bk-form>
     <div class="footer fixed">
-      <bk-button theme="primary" @click="handleSave">
+      <bk-button theme="primary" @click="handleSave" :loading="btnLoading">
         {{ $t('保存并启用') }}
       </bk-button>
       <bk-button @click="() => $emit('handleCancelEdit')">
@@ -98,12 +103,15 @@
 </template>
 
 <script setup lang="ts">
+import { Message } from 'bkui-vue';
 import { defineEmits, defineProps, onMounted, reactive, ref } from 'vue';
 
-import Empty from '@/components/Empty.vue';
+// import Empty from '@/components/Empty.vue';
 import { useValidate } from '@/hooks';
+import { postToStrategies, putToStrategies } from '@/http';
+import { t } from '@/language';
 
-defineEmits(['handleCancelEdit']);
+const emit = defineEmits(['handleCancelEdit', 'updateList']);
 
 const props = defineProps({
   config: {
@@ -144,8 +152,29 @@ const handleChange = () => {
   window.changeInput = true;
 };
 
+const btnLoading = ref(false);
+// 表单校验
 const handleSave = async () => {
-  await basicRef.value.validate();
+  try {
+    await basicRef.value.validate();
+    btnLoading.value = true;
+    if (props.config.type === 'add') {
+      await postToStrategies(formData);
+      Message({ theme: 'success', message: t('协同策略创建成功') });
+      emit('updateList');
+    } else {
+      const params = {
+        name: formData.name,
+        target_tenant_id: formData.target_tenant_id,
+        source_config: formData.source_config,
+      };
+      await putToStrategies(formData.id, params);
+      Message({ theme: 'success', message: t('协同策略更新成功') });
+      emit('updateList');
+    }
+  } finally {
+    btnLoading.value = false;
+  }
 };
 </script>
 
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/ViewDetails.vue b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/ViewDetails.vue
index b44d12d58..e7b89d042 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/ViewDetails.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/ViewDetails.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="view-details-wrapper">
     <div class="view-details-content">
-      <LabelContent :label="$t('策略名称')"></LabelContent>
-      <LabelContent :label="$t('目标公司')"></LabelContent>
+      <LabelContent :label="$t('策略名称')">{{ data.name }}</LabelContent>
+      <LabelContent :label="$t('目标租户')">{{ data.target_tenant_id }}</LabelContent>
+      <LabelContent :label="$t('协同范围')">{{ $t('所有部门 + 用户') }}</LabelContent>
       <!-- 一期不做 -->
       <!-- <div class="content-item">
         <span class="item-key">{{ $t('协同范围') }}：</span>
@@ -16,8 +17,9 @@
           </div>
         </div>
       </div> -->
-      <LabelContent :label="$t('同步范围')"></LabelContent>
-      <LabelContent :label="$t('字段预览')">
+      <LabelContent :label="$t('同步范围')">{{ $t('所有字段') }}</LabelContent>
+      <!-- 一期不做 -->
+      <!-- <LabelContent :label="$t('字段预览')">
         <bk-table
           class="mt-[8px]"
           :data="tableData"
@@ -36,15 +38,15 @@
           <bk-table-column prop="phone" :label="$t('手机号')" />
           <bk-table-column prop="organization" :label="$t('组织')" />
         </bk-table>
-      </LabelContent>
+      </LabelContent> -->
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { defineProps, onMounted, ref } from 'vue';
+import { defineProps } from 'vue';
 
-import Empty from '@/components/Empty.vue';
+// import Empty from '@/components/Empty.vue';
 import LabelContent from '@/components/layouts/LabelContent.vue';
 
 defineProps({
@@ -72,19 +74,9 @@ defineProps({
 //   }
 // };
 
-const tableData = ref([]);
-const isDataEmpty = ref(false);
-const isDataError = ref(false);
-
-onMounted(() => {
-  isDataEmpty.value = false;
-  isDataError.value = false;
-  setTimeout(() => {
-    if (tableData.value.length === 0) {
-      isDataEmpty.value = true;
-    }
-  }, 1000);
-});
+// const tableData = ref([]);
+// const isDataEmpty = ref(false);
+// const isDataError = ref(false);
 </script>
 
 <style lang="less" scoped>
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/index.vue b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/index.vue
index 7d54af308..fbde21205 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/my-share/index.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/index.vue
@@ -9,23 +9,26 @@
       </bk-button>
       <bk-input
         class="header-right"
-        v-model="searchVal"
+        v-model="search"
         type="search"
         clearable
-        @enter="handleEnter"
-        @clear="handleClear"
+        :placeholder="$t('搜索策略名称')"
       />
     </header>
     <bk-table
-      :data="tableData"
+      :data="searchList"
       :border="['outer']"
       :max-height="tableMaxHeight"
-      show-overflow-tooltip>
+      show-overflow-tooltip
+      @column-filter="handleFilter"
+    >
       <template #empty>
         <Empty
           :is-data-empty="isDataEmpty"
+          :is-search-empty="isSearchEmpty"
           :is-data-error="isDataError"
-          @handle-update="handleUpdate"
+          @handle-empty="search = ''"
+          @handle-update="fetchToStrategies"
         />
       </template>
       <bk-table-column prop="name" :label="$t('策略名称')">
@@ -35,19 +38,17 @@
           </bk-button>
         </template>
       </bk-table-column>
-      <bk-table-column prop="target" :label="$t('目标租户')">
-        <template #default="{ row }">
-          <span>{{ row.target?.map(item => item.name).join(', ') || '--' }}</span>
-        </template>
-      </bk-table-column>
-      <bk-table-column prop="operator" :label="$t('创建人')"></bk-table-column>
+      <bk-table-column prop="target_tenant_id" :label="$t('目标租户')" />
+      <bk-table-column prop="creator" :label="$t('创建人')" />
       <bk-table-column prop="created_at" :label="$t('创建时间')"></bk-table-column>
-      <bk-table-column prop="enable" :label="$t('启/停')" :filter="{ list: statusFilters }">
+      <bk-table-column
+        prop="source_status" :label="$t('启/停')"
+        :filter="{ list: statusFilters }">
         <template #default="{ row }">
           <bk-switcher
             theme="primary"
             size="small"
-            v-model="row.enable"
+            :value="row.source_status === 'enabled'"
             @change="handleChange(row)"
           />
         </template>
@@ -57,8 +58,8 @@
           <bk-button text theme="primary" class="mr8" @click="handleClick('edit', row)">
             {{ $t('编辑') }}
           </bk-button>
-          <span v-bk-tooltips="{ content: $t('删除前必须停用该策略'), disabled: !row.enable }">
-            <bk-button text theme="primary" :disabled="row.enable" @click="handleDelete(row)">
+          <span v-bk-tooltips="{ content: $t('删除前必须停用该策略'), disabled: row.source_status === 'disabled' }">
+            <bk-button text theme="primary" :disabled="row.source_status === 'enabled'" @click="handleDelete(row.id)">
               {{ $t('删除') }}
             </bk-button>
           </span>
@@ -89,6 +90,7 @@
           v-else
           :config="detailsConfig"
           @handle-cancel-edit="handleCancelEdit"
+          @update-list="updateList"
         />
       </template>
     </bk-sideslider>
@@ -96,14 +98,15 @@
 </template>
 
 <script setup lang="ts">
-import { bkTooltips as vBkTooltips, InfoBox } from 'bkui-vue';
-import { computed, inject, onMounted, reactive, ref } from 'vue';
+import { bkTooltips as vBkTooltips, InfoBox, Message } from 'bkui-vue';
+import { computed, inject, onMounted, reactive, ref, watch } from 'vue';
 
 import OperationDetails from './OperationDetails.vue';
 import ViewDetails from './ViewDetails.vue';
 
 import Empty from '@/components/Empty.vue';
 import { useTableMaxHeight } from '@/hooks';
+import { deleteToStrategies, getToStrategies, putToStrategiesStatus } from '@/http';
 import { t } from '@/language/index';
 import { useMainViewStore, useUser } from '@/store';
 
@@ -117,37 +120,64 @@ const isLoading = ref(false);
 const tableData = ref([]);
 const isDataEmpty = ref(false);
 const isDataError = ref(false);
-const searchVal = ref('');
+const isSearchEmpty = ref(false);
+const search = ref('');
 
 onMounted(() => {
+  fetchToStrategies();
+});
+
+// 获取协同策略列表
+const fetchToStrategies = async () => {
   try {
     isLoading.value = true;
     isDataEmpty.value = false;
     isDataError.value = false;
-    setTimeout(() => {
-      tableData.value = [];
-      if (tableData.value.length === 0) {
-        isDataEmpty.value = true;
-      }
-    }, 1000);
+    isSearchEmpty.value = false;
+    const res = await getToStrategies();
+    tableData.value = res?.data;
+    if (tableData.value.length === 0) {
+      isDataEmpty.value = true;
+    }
   } catch (error) {
     isDataError.value = true;
   } finally {
     isLoading.value = false;
   }
-});
+};
 
 const statusFilters = [
-  { text: t('启用'), value: true },
-  { text: t('停用'), value: false },
+  { text: t('启用'), value: 'enabled' },
+  { text: t('停用'), value: 'disabled' },
 ];
 
-const handleDelete = (row) => {
+const handleFilter = ({ checked }) => {
+  if (checked.length === 0) return isDataEmpty.value = false;
+  isDataEmpty.value = !tableData.value.some(item => checked.includes(item.status));
+};
+
+// 搜索协同列表
+const searchList = computed(() => tableData.value.filter(item => !search.value || item.name.includes(search.value)));
+
+watch(() => search.value, (val) => {
+  isSearchEmpty.value = val && !searchList.value.length;
+});
+
+const handleChange = (row: any) => {
+  putToStrategiesStatus(row.id).then((res) => {
+    row.source_status = res?.data?.status;
+  });
+};
+
+// 删除协同策略
+const handleDelete = (id: number) => {
   InfoBox({
     title: t('是否删除当前协同？'),
     subTitle: t('删除后，目标租户的用户数据也会同步删除'),
-    onConfirm() {
-      console.log('删除成功', row);
+    onConfirm: async () => {
+      await deleteToStrategies(id);
+      Message({ theme: 'success', message: t('删除成功') });
+      fetchToStrategies();
     },
   });
 };
@@ -158,10 +188,13 @@ const detailsConfig = reactive({
   type: '',
   data: {
     name: '',
-    tenant_id: '',
-    tenant_name: '',
-    methods: 'organization',
-    sync_type: 'all',
+    target_tenant_id: '',
+    source_config: {
+      organization_scope_type: 'all',
+      organization_scope_config: {},
+      field_scope_type: 'all',
+      field_scope_config: {},
+    },
   },
 });
 
@@ -182,6 +215,21 @@ const enumData = {
 
 const isView = computed(() => detailsConfig.type === 'view');
 
+watch(() => detailsConfig.isShow, (val) => {
+  if (!val) {
+    detailsConfig.data = {
+      name: '',
+      target_tenant_id: '',
+      source_config: {
+        organization_scope_type: 'all',
+        organization_scope_config: {},
+        field_scope_type: 'all',
+        field_scope_config: {},
+      },
+    };
+  }
+});
+
 const handleClick = (type: string, item?: any) => {
   if (type !== 'add') {
     detailsConfig.data = item;
@@ -213,6 +261,12 @@ const handleBeforeClose = async () => {
     return Promise.resolve(enableLeave);
   }
 };
+
+const updateList = () => {
+  detailsConfig.isShow = false;
+  window.changeInput = false;
+  fetchToStrategies();
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue
index e6d325959..9a024052b 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue
@@ -6,19 +6,28 @@
         <ul class="operation-content-info flex">
           <li>
             <span class="key">{{ $t('租户名称') }}：</span>
-            <span class="value">{{ detailsConfig.data.name }}</span>
+            <span class="value">{{ formData.source_tenant_name }}</span>
           </li>
           <li>
             <span class="key">{{ $t('租户ID') }}：</span>
-            <span class="value">{{ detailsConfig.data.id }}</span>
+            <span class="value">{{ formData.source_tenant_id }}</span>
           </li>
         </ul>
       </div>
       <div class="operation-card">
+        <p class="operation-content-title">{{ $t('协同数据选择') }}</p>
+        <ul class="operation-content-info">
+          <li>
+            <span class="key">{{ $t('已协同') }}：</span>
+            <span class="value">{{ $t('所有部门 + 用户') }}</span>
+          </li>
+        </ul>
+      </div>
+      <div class="operation-card" v-bkloading="{ loading: isLoading }">
         <div class="operation-content-header">
           <p class="operation-content-title">{{ $t('字段映射') }}</p>
           <bk-button
-            v-if="detailsConfig.type === 'edit' && !isEdit"
+            v-if="!isEdit"
             class="min-w-[48px] mr-[24px]"
             theme="primary"
             outline
@@ -30,13 +39,16 @@
         <bk-form
           v-if="isEdit"
           form-type="vertical"
-          ref="formRef2"
+          ref="formRef"
           :model="fieldSettingData"
           :rules="rulesFieldSetting">
           <FieldMapping
             :field-setting-data="fieldSettingData"
             :api-fields="apiFields"
             :rules="rulesFieldSetting"
+            :source-field="$t('源租户用户字段')"
+            :target-field="$t('本租户用户字段')"
+            :disabled-builtin-field="true"
             @change-api-fields="changeApiFields"
             @handle-add-field="handleAddField"
             @handle-delete-field="handleDeleteField"
@@ -44,12 +56,13 @@
           <div class="ml-[64px]">
             <bk-button
               class="min-w-[64px] mr-[8px]"
-              theme="primary">
+              theme="primary"
+              @click="saveEdit">
               {{ $t('保存') }}
             </bk-button>
             <bk-button
               class="min-w-[64px]"
-              @click="isEdit = false">
+              @click="cancelEdit">
               {{ $t('取消') }}
             </bk-button>
           </div>
@@ -72,33 +85,43 @@
         </div>
       </div>
     </div>
-    <div class="footer fixed" v-if="isEdit">
-      <bk-button theme="primary" @click="handleSave">
+    <div class="footer fixed" v-if="config.type === 'edit'">
+      <bk-button theme="primary" :disabled="isEdit" @click="handleSave">
         {{ $t('确认') }}
       </bk-button>
     </div>
   </div>
 </template>
 
-<script setup lang="ts">import { defineProps, onMounted, reactive, ref } from 'vue';
+<script setup lang="ts">
+import { Message } from 'bkui-vue';
+import { defineEmits, defineProps, onMounted, reactive, ref } from 'vue';
 
 import FieldMapping from '@/components/field-mapping/FieldMapping.vue';
 import { useValidate } from '@/hooks';
 import {
-  getDataSourceDetails,
   getFields,
+  getSourceTenantCustomFields,
+  putFromStrategies,
+  putFromStrategiesConfirm,
 } from '@/http';
+import { t } from '@/language';
 
 const validate = useValidate();
 
-defineProps({
-  detailsConfig: {
+const emit = defineEmits(['updateList']);
+const props = defineProps({
+  config: {
     type: Object,
     default: () => ({}),
   },
 });
 
+const formData = reactive(props.config.data);
+
 const isEdit = ref(false);
+const isLoading = ref(false);
+const formRef = ref();
 
 const rulesFieldSetting = {
   target_field: [validate.required],
@@ -106,7 +129,6 @@ const rulesFieldSetting = {
 };
 
 const apiFields = ref([]);
-const fieldMappingList = ref([]);
 const fieldSettingData = reactive({
   field_mapping: {
     // 内置字段
@@ -117,46 +139,48 @@ const fieldSettingData = reactive({
   addFieldList: [],
 });
 
-onMounted(async () => {
-  const res = await getDataSourceDetails(6);
-  fieldMappingList.value = res.data?.field_mapping;
-  const fieldsRes = await getFields();
-
-  const list = [];
-  const customList = [];
-  const mapFields = (fields, item, isDisabled, fieldMappingType) => {
-    if (fields.name !== item.target_field) return;
-
-    list.push(item.source_field);
-    customList.push(fields.name);
-    Object.assign(fields, {
-      mapping_operation: item.mapping_operation,
-      source_field: item.source_field,
-      disabled: isDisabled,
-    });
-    apiFields.value.push({ key: item.source_field, disabled: isDisabled });
-
-    if (fieldMappingType === 'builtin_fields' && fields.required) {
-      fieldSettingData.field_mapping.builtin_fields.push(fields);
-    } else {
-      fieldSettingData.addFieldList.push(item);
-      fieldSettingData.field_mapping.custom_fields.push(fields);
-    }
-  };
-
-  fieldMappingList.value.forEach((item) => {
-    fieldsRes.data?.builtin_fields?.forEach(fields => mapFields(fields, item, true, 'builtin_fields'));
-    fieldsRes.data?.custom_fields?.forEach(fields => mapFields(fields, item, true, 'custom_fields'));
-  });
-
-
-  fieldsRes.data?.custom_fields?.concat(fieldsRes.data?.builtin_fields || []).forEach((fields) => {
-    if (!customList.includes(fields.name)) {
-      fieldSettingData.field_mapping.custom_fields.push(fields);
-    }
-  });
+onMounted(() => {
+  initFields();
 });
 
+// 初始化字段映射
+const initFields = async () => {
+  try {
+    isLoading.value = true;
+    fieldSettingData.addFieldList = JSON.parse(JSON.stringify(formData.target_config.field_mapping));
+
+    const [fieldsRes, customRes] = await Promise.all([getFields(), getSourceTenantCustomFields(formData.id)]);
+
+    const mapFields = (fields, isDisabled, fieldMappingType) => {
+      Object.assign(fields, {
+        mapping_operation: 'direct',
+        source_field: fields.name,
+        disabled: isDisabled,
+      });
+      apiFields.value.push({ key: fields.name, disabled: isDisabled });
+
+      const targetFieldList = fieldSettingData.field_mapping[fieldMappingType];
+      targetFieldList.push(fields);
+
+      if (fieldMappingType === 'custom_fields') {
+        const filterKeys = new Set(fieldSettingData.addFieldList?.map(item => item.source_field));
+        fields.disabled = filterKeys.has(fields.name);
+        apiFields.value.forEach((item) => {
+          if (filterKeys.has(item.key)) {
+            item.disabled = true;
+          }
+        });
+      }
+    };
+    // 自定义字段的数据来源是本租户的自定义字段
+    fieldsRes.data.custom_fields = customRes?.data || [];
+    fieldsRes.data?.builtin_fields?.forEach(field => mapFields(field, true, 'builtin_fields'));
+    fieldsRes.data?.custom_fields?.forEach(field => mapFields(field, false, 'custom_fields'));
+  } finally {
+    isLoading.value = false;
+  }
+};
+
 const getDisplayName = (item) => {
   const name = ref('');
   fieldSettingData.field_mapping.custom_fields.forEach((field) => {
@@ -219,6 +243,38 @@ const changeCustomField = (newValue, oldValue) => {
   handleChange();
 };
 
+// 取消编辑
+const cancelEdit = () => {
+  isEdit.value = false;
+  apiFields.value = [];
+  fieldSettingData.addFieldList = [];
+  fieldSettingData.field_mapping.builtin_fields = [];
+  fieldSettingData.field_mapping.custom_fields = [];
+  initFields();
+};
+
+const saveEdit = async () => {
+  await formRef.value.validate();
+  if (props.config.type === 'view') {
+    handleSave();
+  }
+};
+
+const handleSave = async () => {
+  const params = {
+    id: formData.id,
+    target_config: {
+      organization_scope_type: 'all',
+      organization_scope_config: {},
+      field_mapping: fieldSettingData.addFieldList,
+    },
+  };
+
+  await props.config.type === 'view' ? putFromStrategies(params) : putFromStrategiesConfirm(params);
+  Message({ theme: 'success', message: t('更新成功') });
+  emit('updateList');
+};
+
 const handleChange = () => {
   window.changeInput = true;
 };
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
index b4414b0bc..2da1ddadb 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
@@ -19,39 +19,40 @@
         <Empty
           :is-data-empty="isDataEmpty"
           :is-data-error="isDataError"
-          @handle-update="fetchCollaborationData"
+          @handle-update="fetchFromStrategies"
         />
       </template>
-      <bk-table-column prop="name" :label="$t('源租户')">
+      <bk-table-column prop="source_tenant_id" :label="$t('源租户')">
         <template #default="{ row }">
           <span>
-            {{ row.name }}
+            {{ row.source_tenant_id }}
           </span>
         </template>
       </bk-table-column>
-      <bk-table-column prop="status" :label="$t('状态')" :filter="{ list: statusFilters }">
+      <bk-table-column prop="target_status" :label="$t('状态')" :filter="{ list: statusFilters }">
         <template #default="{ row }">
           <div>
-            <img :src="dataSourceStatus[row.status]?.icon" class="account-status-icon" />
-            <span>{{ dataSourceStatus[row.status]?.text }}</span>
+            <img :src="dataSourceStatus[row.target_status]?.icon" class="account-status-icon" />
+            <span>{{ dataSourceStatus[row.target_status]?.text }}</span>
           </div>
         </template>
       </bk-table-column>
       <bk-table-column prop="updated_at" :label="$t('更新时间')"></bk-table-column>
-      <bk-table-column prop="enable" :label="$t('启/停')" :filter="{ list: enableFilters }">
+      <bk-table-column prop="target_status" :label="$t('启/停')" :filter="{ list: enableFilters }">
         <template #default="{ row }">
           <bk-switcher
             theme="primary"
             size="small"
-            v-model="row.enable"
-            :disabled="row.status === 'confirmed'"
+            :value="row.target_status === 'enabled'"
+            :disabled="row.target_status === 'unconfirmed'"
+            @change="handleChange(row)"
           />
         </template>
       </bk-table-column>
       <bk-table-column :label="$t('操作')">
         <template #default="{ row }">
           <bk-button
-            v-if="row.status === 'confirmed'"
+            v-if="row.target_status === 'unconfirmed'"
             text
             theme="primary"
             @click="handleDetails(row, 'edit')"
@@ -73,10 +74,11 @@
     <bk-sideslider
       :width="960"
       quick-close
-      v-model:isShow="detailsConfig.isShow"
+      :is-show="detailsConfig.isShow"
       :title="detailsConfig.title"
+      :before-close="handleBeforeClose"
     >
-      <OperationDetails :details-config="detailsConfig" />
+      <OperationDetails :config="detailsConfig" @update-list="updateList" />
     </bk-sideslider>
     <!-- 数据更新记录 -->
     <bk-dialog
@@ -204,12 +206,13 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue';
+import { inject, onMounted, reactive, ref } from 'vue';
 
 import OperationDetails from './OperationDetails.vue';
 
 import Empty from '@/components/Empty.vue';
 import { useTableMaxHeight } from '@/hooks';
+import { getFromStrategies, putFromStrategiesStatus } from '@/http';
 import { t } from '@/language/index';
 import { useMainViewStore } from '@/store';
 import { dataSourceStatus } from '@/utils';
@@ -218,6 +221,7 @@ const store = useMainViewStore();
 store.customBreadcrumbs = false;
 
 const tableMaxHeight = useTableMaxHeight(238);
+const editLeaveBefore = inject('editLeaveBefore');
 const isLoading = ref(false);
 const tableData = ref([]);
 const isDataEmpty = ref(false);
@@ -226,12 +230,12 @@ const isDataError = ref(false);
 const statusFilters = [
   { text: t('正常'), value: 'enabled' },
   { text: t('未启用'), value: 'disabled' },
-  { text: t('待确认'), value: 'confirmed' },
+  { text: t('待确认'), value: 'unconfirmed' },
 ];
 
 const enableFilters = [
-  { text: t('启用'), value: true },
-  { text: t('停用'), value: false },
+  { text: t('启用'), value: 'enabled' },
+  { text: t('停用'), value: 'disabled' },
 ];
 
 const detailsConfig = reactive({
@@ -242,20 +246,19 @@ const detailsConfig = reactive({
 });
 
 onMounted(() => {
-  fetchCollaborationData();
+  fetchFromStrategies();
 });
 
-const fetchCollaborationData = async () => {
+const fetchFromStrategies = async () => {
   try {
     isLoading.value = true;
     isDataEmpty.value = false;
     isDataError.value = false;
-    setTimeout(() => {
-      tableData.value = [];
-      if (tableData.value.length === 0) {
-        isDataEmpty.value = true;
-      }
-    }, 1000);
+    const res = await getFromStrategies();
+    tableData.value = res?.data;
+    if (tableData.value.length === 0) {
+      isDataEmpty.value = true;
+    }
   } catch (error) {
     isDataError.value = true;
   } finally {
@@ -297,6 +300,31 @@ const handleDetails = (item, type) => {
   detailsConfig.title = type === 'view' ? t('协同数据详情') : t('确认协同数据');
   detailsConfig.data = item;
 };
+
+const handleChange = (row) => {
+  putFromStrategiesStatus(row.id).then((res) => {
+    row.target_status = res?.data?.target_status;
+  });
+};
+
+const handleBeforeClose = async () => {
+  let enableLeave = true;
+  if (window.changeInput) {
+    enableLeave = await editLeaveBefore();
+    detailsConfig.isShow = false;
+  } else {
+    detailsConfig.isShow = false;
+  }
+  if (!enableLeave) {
+    return Promise.resolve(enableLeave);
+  }
+};
+
+const updateList = () => {
+  detailsConfig.isShow = false;
+  window.changeInput = false;
+  fetchFromStrategies();
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/pages/src/views/setting/data-source/Http.vue b/src/pages/src/views/setting/data-source/Http.vue
index c96ec6ea7..a5b5ba5bd 100644
--- a/src/pages/src/views/setting/data-source/Http.vue
+++ b/src/pages/src/views/setting/data-source/Http.vue
@@ -170,6 +170,8 @@
           :field-setting-data="fieldSettingData"
           :api-fields="apiFields"
           :rules="rulesFieldSetting"
+          :source-field="$t('用户管理字段')"
+          :target-field="$t('API返回字段')"
           @change-api-fields="changeApiFields"
           @handle-add-field="handleAddField"
           @handle-delete-field="handleDeleteField"