diff --git a/src/pages/src/components/layouts/MainBreadcrumbsDetails.vue b/src/pages/src/components/layouts/MainBreadcrumbsDetails.vue
index b40e63b70..6551316e7 100644
--- a/src/pages/src/components/layouts/MainBreadcrumbsDetails.vue
+++ b/src/pages/src/components/layouts/MainBreadcrumbsDetails.vue
@@ -48,7 +48,9 @@ const handleBack = () => {
   const { back } = window.history.state;
   if (back) {
     router.go(-1);
-    store.customBreadcrumbs = false;
+    if (!window.changeInput) {
+      store.customBreadcrumbs = false;
+    }
   } else {
     const { matched } = route;
     const count = matched.length;
diff --git a/src/pages/src/components/notify-editor/NotifyEditorTemplate.vue b/src/pages/src/components/notify-editor/NotifyEditorTemplate.vue
index e7cad0ed4..657913b0f 100644
--- a/src/pages/src/components/notify-editor/NotifyEditorTemplate.vue
+++ b/src/pages/src/components/notify-editor/NotifyEditorTemplate.vue
@@ -174,7 +174,7 @@ const expiredSms = findMethodScene('sms', props.expiredSmsKey);
 
 <style lang="less" scoped>
 .tab-box {
-  width: 860px;
+  width: 800px;
   border: 1px solid #3A84FF;
 }
 
diff --git a/src/pages/src/css/tenantEditStyle.less b/src/pages/src/css/tenantEditStyle.less
index 1a22ad637..25d300f14 100644
--- a/src/pages/src/css/tenantEditStyle.less
+++ b/src/pages/src/css/tenantEditStyle.less
@@ -43,22 +43,6 @@
         }
       }
 
-      .item-style {
-        :deep(.bk-form-label) {
-          float: unset;
-          width: 100%;
-          text-align: left;
-        }
-
-        :deep(.bk-form-content) {
-          margin-left: 0 !important;
-
-          .bk-form-error {
-            left: 145px;
-          }
-        }
-      }
-
       .operation-content-table {
         margin-top: 16px;
 
diff --git a/src/pages/src/views/data-source/new-data/NewLocalData.vue b/src/pages/src/views/data-source/new-data/NewLocalData.vue
index 6d5c07426..e6dd42929 100644
--- a/src/pages/src/views/data-source/new-data/NewLocalData.vue
+++ b/src/pages/src/views/data-source/new-data/NewLocalData.vue
@@ -19,10 +19,10 @@
       <div class="content-item">
         <p class="item-title">基础信息</p>
         <bk-form-item label="数据源名称" property="name" required>
-          <bk-input style="width: 560px;" v-model="formData.name" :disabled="isDisabled" />
+          <bk-input style="width: 560px;" v-model="formData.name" :disabled="isDisabled" @change="handleChange" />
         </bk-form-item>
         <bk-form-item label="" required>
-          <bk-checkbox v-model="formData.config.enable_account_password_login">
+          <bk-checkbox v-model="formData.config.enable_account_password_login" @change="handleChange">
             开启账密登录
           </bk-checkbox>
         </bk-form-item>
@@ -38,6 +38,7 @@
               :min="10"
               :max="31"
               v-model="formData.config.password_rule.min_length"
+              @change="handleChange"
             />
           </bk-form-item>
           <bk-form-item label="密码必须包含" required>
@@ -58,7 +59,7 @@
               />
               <span>位 出现</span>
             </div>
-            <p class="error-text" v-show="passwordCountError">不能小于5位，大于10位</p>
+            <p class="error-text" v-show="passwordCountError">可选值范围：5-10</p>
             <bk-checkbox v-model="formData.config.password_rule.not_keyboard_order">键盘序</bk-checkbox>
             <bk-checkbox v-model="formData.config.password_rule.not_continuous_letter">连续字母序</bk-checkbox>
             <bk-checkbox v-model="formData.config.password_rule.not_continuous_digit">连续数字序</bk-checkbox>
@@ -66,7 +67,7 @@
             <p class="error-text" v-show="passwordConfigError">密码规则不得为空</p>
           </bk-form-item>
           <bk-form-item label="密码有效期" required>
-            <bk-radio-group v-model="formData.config.password_rule.valid_time">
+            <bk-radio-group v-model="formData.config.password_rule.valid_time" @change="handleChange">
               <bk-radio-button
                 v-for="(item, index) in passwordValidDaysList"
                 :key="index"
@@ -77,7 +78,7 @@
             </bk-radio-group>
           </bk-form-item>
           <bk-form-item label="密码试错次数" required>
-            <bk-radio-group v-model="formData.config.password_rule.max_retries">
+            <bk-radio-group v-model="formData.config.password_rule.max_retries" @change="handleChange">
               <bk-radio-button
                 v-for="(item, index) in maxTrailTimesList"
                 :key="index"
@@ -94,33 +95,40 @@
               suffix="秒"
               :min="0"
               v-model="formData.config.password_rule.lock_time"
+              @change="handleChange"
             />
           </bk-form-item>
         </div>
         <div class="content-item">
           <p class="item-title">初始密码设置</p>
           <bk-form-item label="" required>
-            <bk-checkbox v-model="formData.config.password_initial.force_change_at_first_login">
+            <bk-checkbox
+              v-model="formData.config.password_initial.force_change_at_first_login"
+              @change="handleChange">
               首次登录强制修改密码
             </bk-checkbox>
           </bk-form-item>
           <bk-form-item label="" required>
             <div>
-              <bk-checkbox v-model="formData.config.password_initial.cannot_use_previous_password">
+              <bk-checkbox
+                v-model="formData.config.password_initial.cannot_use_previous_password"
+                @change="handleChange">
                 修改密码时不能重复前
               </bk-checkbox>
               <bk-input
                 style="width: 85px;"
                 type="number"
                 behavior="simplicity"
-                :min="5"
+                :min="0"
+                :max="5"
                 v-model="formData.config.password_initial.reserved_previous_password_count"
+                @change="handleChange"
               />
               <span>次 用过的密码</span>
             </div>
           </bk-form-item>
           <bk-form-item class="form-item-flex" label="密码生成方式" required>
-            <bk-radio-group v-model="formData.config.password_initial.generate_method">
+            <bk-radio-group v-model="formData.config.password_initial.generate_method" @change="handleChange">
               <bk-radio label="random">随机</bk-radio>
               <bk-radio label="fixed">固定</bk-radio>
             </bk-radio-group>
@@ -136,7 +144,7 @@
               <p class="fixed-password-error" v-show="fixedPasswordError">密码长度至少12位，必须包含大小写字母、数字</p>
             </div>
           </bk-form-item>
-          <bk-form-item label="通知方式" required>
+          <bk-form-item label="通知方式" property="config.password_initial.notification.enabled_methods" required>
             <NotifyEditorTemplate
               :active-methods="activeMethods"
               :checkbox-info="checkboxInfo"
@@ -155,7 +163,8 @@
                 <div class="password-header">
                   <bk-checkbox-group
                     class="checkbox-zh"
-                    v-model="formData.config.password_initial.notification.enabled_methods">
+                    v-model="formData.config.password_initial.notification.enabled_methods"
+                    @change="handleChange">
                     <bk-checkbox
                       v-for="(item, index) in checkboxInfo" :key="index"
                       :class="['password-tab', item.status ? 'active-tab' : '']"
@@ -166,7 +175,7 @@
                   </bk-checkbox-group>
                   <div class="edit-info" @click="passwordInitialTemplate">
                     <span style="font-size:14px">编辑通知模板</span>
-                    <AngleUp v-if="isDropdownPasswordExpire" />
+                    <AngleUp v-if="isDropdownPasswordInitial" />
                     <AngleDown v-else />
                   </div>
                 </div>
@@ -177,7 +186,7 @@
         <div class="content-item">
           <p class="item-title">密码到期提醒</p>
           <bk-form-item label="提醒时间" property="config.password_expire.remind_before_expire" required>
-            <bk-checkbox-group v-model="formData.config.password_expire.remind_before_expire">
+            <bk-checkbox-group v-model="formData.config.password_expire.remind_before_expire" @change="handleChange">
               <bk-checkbox
                 v-for="(item, index) in noticeTimeList"
                 :key="index"
@@ -186,7 +195,7 @@
               >
             </bk-checkbox-group>
           </bk-form-item>
-          <bk-form-item label="通知方式" required>
+          <bk-form-item label="通知方式" property="config.password_expire.notification.enabled_methods" required>
             <NotifyEditorTemplate
               :active-methods="activeMethods"
               :checkbox-info="checkboxInfo"
@@ -201,7 +210,8 @@
                 <div class="password-header">
                   <bk-checkbox-group
                     class="checkbox-zh"
-                    v-model="formData.config.password_expire.notification.enabled_methods">
+                    v-model="formData.config.password_expire.notification.enabled_methods"
+                    @change="handleChange">
                     <bk-checkbox
                       v-for="(item, index) in checkboxInfo" :key="index"
                       :class="['password-tab', item.status ? 'active-tab' : '']"
@@ -334,14 +344,19 @@ watch(() => formData.config?.password_rule, (value) => {
 
   if (!passwordConfigError.value && isCountInRange) {
     passwordCountError.value = false;
+  } else if (!passwordConfigError.value && !isCountInRange) {
+    passwordCountError.value = !isCountInRange;
   } else {
     passwordCountError.value = count === 0 && !passwordConfigError.value;
     passwordConfigError.value = count !== 0 && passwordConfigError.value;
   }
 }, { deep: true });
 
-watch(() => formData.config?.password_rule?.not_continuous_count, (value) => {
+watch(() => formData.config?.password_rule?.not_continuous_count, (value, oldVal) => {
   if (!value) return;
+  if (value !== oldVal) {
+    window.changeInput = true;
+  }
   const list = Object.entries(formData.config?.password_rule)
     .filter(([key, val]) => passwordNotAllowed[key] && val)
     .map(val => val);
@@ -351,7 +366,7 @@ watch(() => formData.config?.password_rule?.not_continuous_count, (value) => {
   const isValueInRange = value >= 5 && value <= 10;
   passwordCountError.value = !isValueInRange;
   passwordConfigError.value = !!list.every(v => !v);
-}, { deep: true });
+});
 
 watch(() => formData.config?.password_initial?.generate_method, (value) => {
   if (value === 'random') {
@@ -417,6 +432,8 @@ const handleClickCancel = () => {
 const btnLoading = ref(false);
 const handleSubmit = async () => {
   try {
+    fixedPasswordError.value = formData.config?.password_initial?.generate_method === 'fixed'
+      && !formData.config.password_initial.fixed_password;
     if (passwordRuleError.value
       || passwordCountError.value
       || passwordConfigError.value
@@ -458,6 +475,7 @@ const updateDataSource = async (params) => {
     plugin_config: params.plugin_config,
   };
   await putDataSourceDetails(data);
+  window.changeInput = false;
   router.push({ name: 'local' });
   Message({
     theme: 'success',
@@ -467,6 +485,7 @@ const updateDataSource = async (params) => {
 
 const getDataSource = async (params) => {
   await newDataSource(params);
+  window.changeInput = false;
   router.push({ name: 'local' });
   Message({
     theme: 'success',
@@ -482,6 +501,10 @@ const handleBlur = () => {
 const handleFocus = () => {
   fixedPasswordError.value = false;
 };
+
+const handleChange = () => {
+  window.changeInput = true;
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/pages/src/views/setting/FieldSetting.vue b/src/pages/src/views/setting/FieldSetting.vue
index 85071a09e..180d0cc93 100644
--- a/src/pages/src/views/setting/FieldSetting.vue
+++ b/src/pages/src/views/setting/FieldSetting.vue
@@ -24,7 +24,6 @@
       <bk-table-column prop="name" label="字段名称">
         <template #default="{ row }">
           <div class="field-name">
-            <i class="user-icon icon-drag move" />
             <span class="name">{{ row.name }}</span>
             <bk-tag theme="info" v-if="row.builtin">内置</bk-tag>
           </div>
@@ -76,8 +75,7 @@
 <script setup lang="ts">
 import { Message } from 'bkui-vue';
 import InfoBox from 'bkui-vue/lib/info-box';
-import Sortable from 'sortablejs';
-import { inject, nextTick, reactive } from 'vue';
+import { inject, reactive } from 'vue';
 
 import FieldsAdd from './FieldsAdd.vue';
 
@@ -164,25 +162,6 @@ const fieldStatus = (type: boolean) => {
   }
 };
 
-const initSortable = (className: string) => {
-  // 获取表格row的父节点
-  const table = document.querySelector(`.${className} .bk-table-body tbody`);
-  // 创建拖拽实例
-  Sortable.create(table, {
-    handle: '.move',
-    group: table,
-    ghostClass: 'blue-background-class',
-    animation: 150,
-    onUpdate: (event: any) => {
-      console.log('event', event);
-    },
-  });
-};
-
-nextTick(() => {
-  initSortable('field-setting-table');
-});
-
 const addField = () => {
   fieldData.currentEditorData = {};
   fieldData.title = '添加字段';
@@ -241,12 +220,6 @@ const fetchFieldList = () => {};
 
   :deep(.field-setting-table) {
     .field-name {
-      .move {
-        font-size: 16px;
-        color: #c8c8c8;
-        cursor: move;
-      }
-
       .name {
         margin: 0 8px;
         color: #63656e;
diff --git a/src/pages/src/views/setting/FieldsAdd.vue b/src/pages/src/views/setting/FieldsAdd.vue
index 33dfd86a7..8368e9456 100644
--- a/src/pages/src/views/setting/FieldsAdd.vue
+++ b/src/pages/src/views/setting/FieldsAdd.vue
@@ -147,7 +147,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref, watch } from 'vue';
+import { computed, defineEmits, defineProps, reactive, ref, watch } from 'vue';
 
 const props = defineProps({
   currentEditorData: {
diff --git a/src/pages/src/views/tenant/group-details/OperationDetails.vue b/src/pages/src/views/tenant/group-details/OperationDetails.vue
index 5c8b32832..53c4056b7 100644
--- a/src/pages/src/views/tenant/group-details/OperationDetails.vue
+++ b/src/pages/src/views/tenant/group-details/OperationDetails.vue
@@ -59,33 +59,69 @@
           </bk-table>
         </bk-form>
       </div>
-      <!-- <div class="operation-card" v-if="!isEdit">
+      <div class="operation-card" v-if="!isEdit">
         <div class="operation-content-title">管理员初始密码</div>
         <bk-form
-          class="operation-content-form"
-          ref="passwordRef"
-          :model="formData.password_settings"
-          :rules="rulesPasswordInfo"
+          form-type="vertical"
+          :model="formData.password_initial_config"
         >
-          <bk-form-item
-            class="item-style"
-            label="密码生成"
-            required
-            property="init_password"
-          >
-            <bk-radio-group v-model="formData.password_settings.init_password_method">
-              <bk-radio label="random_password" :disabled="true">随机</bk-radio>
-              <bk-radio label="fixed_password">固定</bk-radio>
+          <bk-form-item class="form-item-password" label="密码生成" required>
+            <bk-radio-group v-model="formData.password_initial_config.generate_method">
+              <bk-radio label="random">随机</bk-radio>
+              <bk-radio label="fixed">固定</bk-radio>
+            </bk-radio-group>
+            <div>
               <bk-input
-                style="margin-left: 24px; width: 240px;"
-                v-if="formData.password_settings.init_password_method === 'fixed_password'"
+                :class="['input-password', { 'input-error': fixedPasswordError }]"
+                v-if="formData.password_initial_config.generate_method === 'fixed'"
                 type="password"
-                v-model="formData.password_settings.init_password"
+                v-model="formData.password_initial_config.fixed_password"
+                @blur="handleBlur"
+                @focus="handleFocus"
               />
-            </bk-radio-group>
+              <p class="fixed-password error" v-show="fixedPasswordError">密码长度至少12位，必须包含大小写字母、数字</p>
+            </div>
+          </bk-form-item>
+          <bk-form-item label="通知方式" required>
+            <NotifyEditorTemplate
+              :active-methods="activeMethods"
+              :checkbox-info="checkboxInfo"
+              :data-list="formData.password_initial_config.notification.templates"
+              :is-template="isPasswordInitial"
+              :expiring-email-key="'user_initialize'"
+              :expired-email-key="'reset_password'"
+              :expiring-sms-key="'user_initialize'"
+              :expired-sms-key="'reset_password'"
+              :create-account-email="'创建账户邮件'"
+              :reset-password-email="'重设密码后的邮件'"
+              :create-account-sms="'创建账户短信'"
+              :reset-password-sms="'重设密码后的短信'"
+              @handleEditorText="handleEditorText">
+              <template #label>
+                <div class="password-header">
+                  <bk-checkbox-group
+                    class="checkbox-zh"
+                    v-model="formData.password_initial_config.notification.enabled_methods">
+                    <bk-checkbox
+                      v-for="(item, index) in checkboxInfo" :key="index"
+                      :class="['password-tab', item.status ? 'active-tab' : '']"
+                      style="margin-left: 5px;"
+                      :label="item.value">
+                      <span class="checkbox-item" @click="handleClickLabel(item)">{{item.label}}</span>
+                    </bk-checkbox>
+                  </bk-checkbox-group>
+                  <div class="edit-info" @click="passwordInitialTemplate">
+                    <span style="font-size:14px">编辑通知模板</span>
+                    <AngleUp v-if="isDropdownPasswordInitial" />
+                    <AngleDown v-else />
+                  </div>
+                </div>
+              </template>
+            </NotifyEditorTemplate>
+            <p class="error" v-show="enabledMethodsError">通知方式不能为空</p>
           </bk-form-item>
         </bk-form>
-      </div> -->
+      </div>
     </div>
     <div class="footer">
       <bk-button theme="primary" @click="handleSubmit" :loading="state.isLoading">
@@ -99,12 +135,14 @@
 </template>
 
 <script setup lang="tsx">
-import { ref, reactive, computed, nextTick, defineProps, defineEmits } from "vue";
+import { AngleDown, AngleUp } from 'bkui-vue/lib/icon';
+import { ref, reactive, computed, nextTick, defineProps, defineEmits, watch } from "vue";
 import { createTenants, putTenants, getTenantUsersList } from "@/http/tenantsFiles";
 import { getBase64 } from "@/utils";
 import Empty from "@/components/Empty.vue";
 import MemberSelector from "./MemberSelector.vue";
 import useValidate from "@/hooks/use-validate";
+import NotifyEditorTemplate from '@/components/notify-editor/NotifyEditorTemplate.vue';
 
 interface TableItem {
   username: string;
@@ -135,7 +173,6 @@ const validate = useValidate();
 
 const basicRef = ref();
 const userRef = ref();
-const passwordRef = ref();
 const formData = reactive({
   ...props.tenantsData
 });
@@ -167,8 +204,55 @@ const rulesUserInfo = {
   phone: [validate.required, validate.phone],
 };
 
-const rulesPasswordInfo = {
-  init_password: [validate.required],
+const fixedPasswordError = ref(false);
+const enabledMethodsError = ref(false);
+const activeMethods = ref('email');
+// 初始密码
+const isPasswordInitial = ref(false);
+const isDropdownPasswordInitial = ref(false);
+const checkboxInfo = [
+  { value: 'email', label: '邮箱', status: true },
+  { value: 'sms', label: '短信', status: false },
+];
+
+watch(() => formData.password_initial_config?.generate_method, (value) => {
+  if (value === 'random') {
+    formData.password_initial_config.fixed_password = null;
+    fixedPasswordError.value = false;
+  }
+});
+
+watch(() => formData.password_initial_config?.notification?.enabled_methods, (value) => {
+  enabledMethodsError.value = !value.length;
+});
+
+const handleBlur = () => {
+  const result = /^\S*(?=\S{12,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])\S*$/.test(formData.password_initial_config.fixed_password);
+  fixedPasswordError.value = !result;
+};
+
+const handleFocus = () => {
+  fixedPasswordError.value = false;
+};
+
+const handleClickLabel = (item) => {
+  checkboxInfo.forEach((element) => {
+    element.status = element.value === item.value;
+  });
+};
+
+const passwordInitialTemplate = () => {
+  isPasswordInitial.value = !isPasswordInitial.value;
+  isDropdownPasswordInitial.value = !isDropdownPasswordInitial.value;
+};
+
+const handleEditorText = (html, text, key, type) => {
+  formData.password_initial_config.notification.templates.forEach((item) => {
+    if (item.method === type && item.scene === key) {
+      item.content = text;
+      item.content_html = html;
+    }
+  });
 };
 
 const files = computed(() => {
@@ -301,12 +385,13 @@ function handleItemChange(index: number, action: 'add' | 'remove') {
 }
 // 校验表单
 async function handleSubmit() {
-  const validationPromises = [
-    basicRef.value.validate(),
-    userRef.value.validate(),
-  ];
+  fixedPasswordError.value = formData.password_initial_config?.generate_method === 'fixed'
+    && !formData.password_initial_config.fixed_password;
+  
+  if (fixedPasswordError.value || enabledMethodsError.value) return;
+
+  await Promise.all([basicRef.value.validate(), userRef.value.validate()]);
 
-  await Promise.all(validationPromises);
   state.isLoading = true;
   props.type === "add" ? createTenantsFn() : putTenantsFn();
 }
@@ -401,4 +486,35 @@ const handleChange = () => {
 
 <style lang="less" scoped>
 @import url("@/css/tenantEditStyle.less");
+@import url('@/components/notify-editor/NotifyEditor.less');
+
+.form-item-password {
+  ::v-deep .bk-form-content {
+    display: flex;
+
+    .input-password {
+      width: 240px;
+      margin-left: 24px;
+    }
+
+    .input-error {
+      border-color: #ea3636;
+    }
+  }
+}
+
+.error {
+  position: absolute;
+  left: 0;
+  padding-top: 4px;
+  font-size: 12px;
+  line-height: 1;
+  color: #ea3636;
+  text-align: left;
+  animation: form-error-appear-animation 0.15s;
+}
+
+.fixed-password {
+  left: 147px;
+}
 </style>
diff --git a/src/pages/src/views/tenant/group-details/index.vue b/src/pages/src/views/tenant/group-details/index.vue
index df4e44482..71904ce6c 100644
--- a/src/pages/src/views/tenant/group-details/index.vue
+++ b/src/pages/src/views/tenant/group-details/index.vue
@@ -115,6 +115,7 @@ import OperationDetails from './OperationDetails.vue';
 import ViewDetails from './ViewDetails.vue';
 
 import Empty from '@/components/Empty.vue';
+import { getDefaultConfig } from '@/http/dataSourceFiles';
 import {
   getTenantDetails,
   getTenants,
@@ -154,6 +155,7 @@ const state = reactive({
         phone_country_code: '86',
       },
     ],
+    password_initial_config: {},
   },
 });
 const detailsConfig = reactive({
@@ -196,13 +198,7 @@ watch(
             phone_country_code: '86',
           },
         ],
-        // password_settings: {
-        //   init_password: "",
-        //   init_password_method: "fixed_password",
-        //   init_notify_method: [],
-        //   init_sms_config: {},
-        //   init_mail_config: {},
-        // },
+        password_initial_config: {},
       };
     }
   },
@@ -215,9 +211,11 @@ const convertFormat = name => name?.map(item => item?.name).join(',') || '--';
 
 const handleClick = async (type: string, item?: any) => {
   if (type !== 'add') {
-    await getTenantDetails(item.id).then((res: any) => {
-      state.tenantsData = res.data;
-    });
+    const res = await getTenantDetails(item.id);
+    state.tenantsData = res.data;
+  } else {
+    const res = await getDefaultConfig('local');
+    state.tenantsData.password_initial_config = res.data.config.password_initial;
   }
   detailsConfig.title = enumData[type].title;
   detailsConfig.type = enumData[type].type;
@@ -366,6 +364,16 @@ const handleBeforeClose = async () => {
   :deep(.bk-modal-content) {
     height: calc(100vh - 106px);
     background: #f5f7fa;
+
+    &::-webkit-scrollbar {
+      width: 4px;
+      background-color: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background-color: #dcdee5;
+      border-radius: 4px;
+    }
   }
 }
 </style>