diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue
index 22622cce4..ed52196db 100644
--- a/packages/common/component/BlockHistoryList.vue
+++ b/packages/common/component/BlockHistoryList.vue
@@ -1,26 +1,31 @@
 <template>
-  <ul>
-    <li v-for="item in history" :key="item.id" class="item">
-      <block-history-template :blockHistory="item" :is-block-manage="isBlockManage"></block-history-template>
-      <span class="item-icon">
-        <span @click="$emit('preview', item)"
-          ><svg-button class="svg-item-icon" name="text-page-review"></svg-button><span>预览</span></span
-        >
-        <span v-if="!isBlockManage" @click="$emit('restore', item)"
-          ><svg-button class="svg-item-icon" name="text-page-revert"></svg-button><span>还原</span></span
-        >
-      </span>
-    </li>
-  </ul>
+  <tiny-grid :data="history" height="300" v-if="history.length">
+    <tiny-grid-column v-if="isBlockManage" field="version" title="版本号">
+      <template v-slot="data">
+        {{ data.row.version }}
+        <span v-if="data.row.version === lastVersion.versions" class="version-v">最新</span>
+      </template>
+    </tiny-grid-column>
+    <tiny-grid-column field="updated_at" title="发布时间">
+      <template v-slot="data">
+        {{ format(data.row.updated_at, 'yyyy/MM/dd hh:mm:ss') }}
+      </template>
+    </tiny-grid-column>
+    <tiny-grid-column field="message" title="描述"></tiny-grid-column>
+    <tiny-grid-column width="90" field="operation" title="操作">
+      <template v-slot="data">
+        <span @click="$emit('preview', data.row)" class="operation-text">预览</span>
+        <span v-if="!isBlockManage" @click="$emit('restore', data.row)" class="operation-text">还原</span>
+      </template>
+    </tiny-grid-column>
+  </tiny-grid>
   <div v-if="!history.length" class="empty">暂无数据</div>
 </template>
 
 <script setup>
 import { defineEmits, defineProps } from 'vue'
-import { SvgButton } from '../index'
-
-// 引入组件在template上使用
-import BlockHistoryTemplate from './BlockHistoryTemplate.vue'
+import { format } from '@opentiny/vue-renderless/common/date'
+import { Grid as TinyGrid, GridColumn as TinyGridColumn } from '@opentiny/vue'
 
 defineProps({
   history: {
@@ -30,6 +35,10 @@ defineProps({
   isBlockManage: {
     type: Boolean,
     default: false
+  },
+  lastVersion: {
+    type: Object,
+    default: () => {}
   }
 })
 
@@ -37,60 +46,22 @@ defineEmits(['preview', 'restore'])
 </script>
 
 <style lang="less" scoped>
-.item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0px 16px;
-
-  &:not(:last-child) {
-    border-bottom: 1px solid
-      var(--ti-lowcode-component-block-history-list-item-border-color, --ti-lowcode-tabs-border-color);
-  }
-
-  &:hover {
-    background-color: var(--ti-lowcode-component-block-history-list-item-hover-bg);
-    .item-icon {
-      display: block;
-    }
-  }
+.version-v {
+  font-size: 12px;
+  padding: 2px 8px;
+  margin-left: 5px;
+  background-color: var(--te-common-bg-tag);
+  color: var(--te-common-color-success);
+  border-radius: var(--te-base-border-radius-1);
 }
-
-.item-icon {
-  display: none;
-  > span {
-    border: 1px solid var(--ti-lowcode-component-block-history-list-item-btn-border-color);
-    height: 28px;
-    color: var(--ti-lowcode-component-block-history-list-item-btn-color);
-    font-size: 12px;
-    border-radius: 2px;
-    cursor: pointer;
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    transition: 0.3s;
-    padding: 0 10px;
-    .svg-item-icon {
-      color: var(--ti-lowcode-component-block-history-list-item-btn-color);
-    }
-    .svg-item-icon:hover {
-      color: var(--ti-lowcode-component-block-history-list-item-btn-hover-color);
-    }
-    &:hover {
-      color: var(--ti-lowcode-component-block-history-list-item-btn-hover-color);
-      background: var(--ti-lowcode-component-block-history-list-item-btn-hover-bg);
-    }
-
-    &:last-child {
-      margin-left: 4px;
-    }
-    > span {
-      margin-left: 4px;
-    }
+.operation-text {
+  color: var(--te-common-text-emphasize);
+  & + .operation-text {
+    margin-left: 8px;
   }
 }
 
 .empty {
-  color: var(--ti-lowcode-common-empty-text-color);
+  color: var(--te-common-text-weaken);
 }
 </style>
diff --git a/packages/common/component/ButtonGroup.vue b/packages/common/component/ButtonGroup.vue
index 81d65c995..f55498c36 100644
--- a/packages/common/component/ButtonGroup.vue
+++ b/packages/common/component/ButtonGroup.vue
@@ -8,12 +8,25 @@
 .button-group {
   display: grid;
   grid-auto-flow: column;
-  column-gap: 8px;
+  column-gap: 4px;
   align-items: center;
 
   :deep(.svg-button),
   :deep(.tiny-button) {
     margin: 0;
   }
+  :deep(.tiny-button) {
+    padding: 0;
+    min-width: 40px;
+  }
+  :deep(.tiny-button + .svg-button) {
+    margin-left: 4px;
+  }
+  :deep(.tiny-button + .tiny-button) {
+    margin-left: 8px;
+  }
+  :deep(.tiny-button.tiny-button.tiny-button--default) {
+    border-color: var(--te-common-border-secondary);
+  }
 }
 </style>
diff --git a/packages/common/component/LifeCycles.vue b/packages/common/component/LifeCycles.vue
index cf9b15aaf..5f56b10db 100644
--- a/packages/common/component/LifeCycles.vue
+++ b/packages/common/component/LifeCycles.vue
@@ -1,8 +1,16 @@
 <template>
   <div class="life-cycle">
-    <tiny-popover v-model="state.showPopover" placement="bottom-end" trigger="hover" popperClass="option-popper">
+    <tiny-popover
+      v-model="state.showPopover"
+      placement="bottom-end"
+      trigger="hover"
+      popperClass="option-popper"
+      :open-delay="OPEN_DELAY.Default"
+    >
       <template #reference>
-        <tiny-button class="life-cycle-btn"><svg-icon name="add"></svg-icon>添加页面生命周期 </tiny-button>
+        <tiny-button class="life-cycle-btn"
+          ><svg-icon name="add"></svg-icon>{{ isPage ? '添加页面生命周期' : '添加区块生命周期' }}
+        </tiny-button>
       </template>
       <div class="popover-list">
         <ul>
@@ -19,23 +27,33 @@
     </tiny-popover>
   </div>
   <div class="life-cycle-tips">{{ lifeCycleTips }}</div>
-  <meta-list-items :optionsList="Object.keys(state.bindLifeCycles)" :draggable="false">
+  <meta-list-items
+    :optionsList="Object.keys(state.bindLifeCycles)"
+    :draggable="false"
+    :class="{ 'life-cycle-content-list': Object.keys(state.bindLifeCycles).length }"
+  >
     <template #content="{ data }">
       <div class="life-cycle-content-item">
         {{ data }}
       </div>
     </template>
     <template #operate="{ data }">
-      <svg-button
-        class="opt-button"
-        :hoverBgColor="false"
-        name="text-source-setting"
-        @click="openLifeCyclesPanel(data)"
-      ></svg-button>
-      <svg-button class="opt-button" :hoverBgColor="false" name="delete" @click="deleteLifeCycle(data)"></svg-button>
+      <svg-button :hoverBgColor="false" name="setting" @click="openLifeCyclesPanel(data)"></svg-button>
+      <svg-button :hoverBgColor="false" name="delete" @click="deleteLifeCycle(data)"></svg-button>
     </template>
   </meta-list-items>
-  <tiny-dialog-box v-model:visible="state.showLifeCyclesDialog" fullscreen :title="state.title" :append-to-body="true">
+  <tiny-dialog-box v-model:visible="state.showLifeCyclesDialog" fullscreen :show-close="false" :append-to-body="true">
+    <template #title>
+      <div class="bind-dialog-title">
+        <div class="bind-dialog-text">
+          {{ isPage ? '添加页面生命周期' : '添加区块生命周期' }}
+        </div>
+        <div class="bind-dialog-btn">
+          <tiny-button type="info" @click="editorConfirm">保存</tiny-button>
+          <svg-button name="close" @click="state.showLifeCyclesDialog = false"></svg-button>
+        </div>
+      </div>
+    </template>
     <div v-if="state.showLifeCyclesDialog" class="dialog-content">
       <div class="dialog-content-left">
         <tiny-search placeholder="搜索" @update:modelValue="searchLifeCyclesList"></tiny-search>
@@ -62,12 +80,7 @@
       </div>
     </div>
 
-    <template #footer>
-      <div class="bind-dialog-footer">
-        <tiny-button @click="state.showLifeCyclesDialog = false">取 消</tiny-button>
-        <tiny-button type="info" @click="editorConfirm">确 定</tiny-button>
-      </div>
-    </template>
+    <template #footer> </template>
   </tiny-dialog-box>
 </template>
 
@@ -82,6 +95,8 @@ import VueMonaco from './VueMonaco.vue'
 import { initCompletion } from '../js/completion'
 import { initLinter, lint } from '../js/linter'
 import { SvgButton } from '../index'
+import { constants } from '@opentiny/tiny-engine-utils'
+const { OPEN_DELAY } = constants
 
 export default {
   components: {
@@ -237,7 +252,8 @@ export default {
       deleteLifeCycle,
       editorConfirm,
       editorDidMount,
-      handleEditorChange
+      handleEditorChange,
+      OPEN_DELAY
     }
   }
 }
@@ -264,10 +280,13 @@ export default {
 }
 .life-cycle-tips {
   color: var(--ti-lowcode-life-cycle-alert-color);
-  margin: 4px 0 12px 0;
+  margin: 4px 0 0;
   height: 16px;
   line-height: 16px;
 }
+.life-cycle-content-list {
+  margin-top: 12px;
+}
 .life-cycle-alert {
   color: var(--ti-lowcode-life-cycle-alert-color);
   margin-left: 20px;
@@ -277,9 +296,8 @@ export default {
   color: var(--te-common-text-primary);
 }
 .opt-button {
-  width: auto;
   &:last-child {
-    margin-right: var(--te-base-space-3x);
+    margin-right: var(--te-base-space-2x);
   }
 }
 
@@ -358,4 +376,22 @@ export default {
   align-items: center;
   margin-top: 20px;
 }
+.bind-dialog-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .bind-dialog-text {
+    color: var(--te-common-text-primary);
+    font-size: var(--te-base-font-size-1);
+  }
+  .bind-dialog-btn {
+    display: flex;
+    align-items: center;
+    .tiny-button {
+      margin-right: 8px;
+      min-width: 40px;
+    }
+  }
+}
 </style>
diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
index 5e730bf8a..c92de3a62 100644
--- a/packages/common/component/MetaCodeEditor.vue
+++ b/packages/common/component/MetaCodeEditor.vue
@@ -267,7 +267,7 @@ export default {
   width: 100%;
   display: flex;
   text-align: center;
-  .tiny-button.edit-btn {
+  .tiny-button.tiny-button.edit-btn {
     color: var(--te-common-text-primary);
     border-color: var(--te-common-border-default);
     flex: 1;
@@ -291,6 +291,7 @@ export default {
 .btn-box {
   display: flex;
   justify-content: flex-end;
+  width: 100%;
   &:has(.format-btn) {
     justify-content: space-between;
   }
@@ -304,6 +305,7 @@ export default {
   height: 24px;
   padding: 4px;
   padding-left: 10px;
+  padding-right: 12px;
   border: 1px solid var(--ti-lowcode-meta-codeEditor-border-color);
   border-radius: var(--te-base-border-radius-1);
 
diff --git a/packages/common/component/MetaListItem.vue b/packages/common/component/MetaListItem.vue
index 332baf51c..305d44c21 100644
--- a/packages/common/component/MetaListItem.vue
+++ b/packages/common/component/MetaListItem.vue
@@ -61,9 +61,6 @@
     @update:visible="isShow = $event"
   >
     <span class="switch-tip">
-      <span>
-        <svg-icon name="warning"></svg-icon>
-      </span>
       <span>确定删除吗？</span>
     </span>
     <template #footer>
@@ -292,6 +289,7 @@ export default {
       &.right {
         float: left;
         text-align: right;
+        margin-right: 8px;
       }
     }
   }
@@ -302,17 +300,17 @@ export default {
   .icon-close {
     position: absolute;
     top: 6px;
-    right: 6px;
+    right: 10px;
   }
 }
 .add-options {
-  overflow-y: scroll;
-  padding: 20px 0 20px 2px;
+  overflow-y: auto;
+  max-height: calc(100vh - 94px);
   &.top {
     margin-bottom: 0;
   }
   &::-webkit-scrollbar-track-piece {
-    background: var(--ti-lowcode-toolbar-bg);
+    background: var(--te-common-bg-container-weaken);
   }
   &::-webkit-scrollbar {
     width: 5px;
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 3709f8973..071f6f284 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -53,14 +53,14 @@
           <div class="setting-menu" @mouseover.stop="handleSettingMouseOver" @mouseleave="handleBlockItemLeave">
             <ul class="list">
               <li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
-                <svg-button class="list-item-svg" name="to-edit"> </svg-button>
+                <svg-button class="list-item-svg" :hoverBgColor="false" name="to-edit"> </svg-button>
               </li>
               <li
                 class="list-item"
                 @mouseover.stop="iconSettingMove"
                 @mousedown.stop.prevent="iconClick({ event: $event, item, index })"
               >
-                <svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
+                <svg-button class="list-item-svg" :hoverBgColor="false" name="setting"> </svg-button>
               </li>
             </ul>
           </div>
@@ -74,12 +74,12 @@
             <ul class="list">
               <tiny-tooltip content="版本列表" placement="top">
                 <li class="list-item" @click.stop="$emit('openVersionPanel', { item, index })">
-                  <svg-button class="list-item-svg" name="versions"> </svg-button>
+                  <svg-button class="list-item-svg" :hoverBgColor="false" name="versions"> </svg-button>
                 </li>
               </tiny-tooltip>
               <tiny-tooltip content="移除" placement="top">
                 <li class="list-item" @click.stop="$emit('deleteBlock', item)">
-                  <svg-button class="list-item-svg" name="remove"> </svg-button>
+                  <svg-button class="list-item-svg" :hoverBgColor="false" name="remove"> </svg-button>
                 </li>
               </tiny-tooltip>
             </ul>
@@ -747,12 +747,6 @@ export default {
       font-size: 14px;
       color: var(--te-common-icon-secondary);
     }
-    .list-item-svg {
-      color: var(--te-common-icon-secondary);
-    }
-    .list-item-svg:hover {
-      background-color: transparent;
-    }
   }
 }
 </style>
diff --git a/packages/common/component/PluginPanel.vue b/packages/common/component/PluginPanel.vue
index cf0fb240f..297ef4fd2 100644
--- a/packages/common/component/PluginPanel.vue
+++ b/packages/common/component/PluginPanel.vue
@@ -108,7 +108,10 @@ export default {
       align-items: center;
 
       :deep(.svg-button + .svg-button) {
-        margin: 0;
+        margin-left: 4px;
+      }
+      :deep(.svg-button + .icon-wrap) {
+        margin-left: 4px;
       }
     }
   }
diff --git a/packages/common/component/PluginSetting.vue b/packages/common/component/PluginSetting.vue
index 4491fed5c..37e50e972 100644
--- a/packages/common/component/PluginSetting.vue
+++ b/packages/common/component/PluginSetting.vue
@@ -9,15 +9,17 @@
       </slot>
       <div class="button-group-wrap">
         <slot name="header">
-          <tiny-button v-if="!isIconButton" type="info" @click="$emit('save')" class="plugin-save">保存</tiny-button>
-          <tiny-button v-if="isIconButton" :icon="icon" type="info" @click="$emit('add')">
-            {{ iconButtonText }}
-          </tiny-button>
-          <div v-if="showIfFullScreen" class="cursor" @click="fullScreen">
-            <svg-icon v-if="!state.isFullScreen" name="full-screen"></svg-icon>
-            <svg-icon v-if="state.isFullScreen" name="cancel-full-screen"></svg-icon>
-          </div>
-          <icon-close class="icon-close close" @click="$emit('cancel')"></icon-close>
+          <button-group>
+            <tiny-button v-if="!isIconButton" type="info" @click="$emit('save')" class="plugin-save">保存</tiny-button>
+            <tiny-button v-if="isIconButton" :icon="icon" type="info" @click="$emit('add')">
+              {{ iconButtonText }}
+            </tiny-button>
+            <div v-if="showIfFullScreen" class="cursor" @click="fullScreen">
+              <svg-button v-if="!state.isFullScreen" name="full-screen"></svg-button>
+              <svg-button v-if="state.isFullScreen" name="cancel-full-screen"></svg-button>
+            </div>
+            <svg-button name="close" @click="$emit('cancel')"></svg-button>
+          </button-group>
         </slot>
       </div>
     </div>
@@ -31,7 +33,9 @@
 <script>
 import { reactive, watchEffect } from 'vue'
 import { Button } from '@opentiny/vue'
-import { iconPlus, iconClose } from '@opentiny/vue-icon'
+import { iconPlus } from '@opentiny/vue-icon'
+import ButtonGroup from './ButtonGroup.vue'
+import SvgButton from './SvgButton.vue'
 
 const EVENTS = {
   FULL_SCREEN_CHANGE: 'fullScreenChange',
@@ -44,7 +48,8 @@ const EVENTS = {
 export default {
   components: {
     TinyButton: Button,
-    IconClose: iconClose()
+    SvgButton,
+    ButtonGroup
   },
   props: {
     /**
@@ -110,8 +115,7 @@ export default {
     return {
       state,
       fullScreen,
-      getFullScreenLabel,
-      IconClose: iconClose()
+      getFullScreenLabel
     }
   }
 }
@@ -138,7 +142,7 @@ export default {
   }
 
   &.second-panel {
-    left: calc(var(--base-left-panel-width) + var(--base-collection-panel-width) - 6px);
+    left: calc(var(--base-left-panel-width) + var(--base-collection-panel-width));
     z-index: 1;
   }
 
@@ -150,7 +154,7 @@ export default {
   }
 
   .cursor {
-    margin-left: 12px;
+    margin-left: 8px;
     cursor: pointer;
   }
 
@@ -181,6 +185,9 @@ export default {
     :deep(.svg-button + .svg-button) {
       margin: 0;
     }
+    :deep(.tiny-button.tiny-button) {
+      margin-right: 0;
+    }
   }
 
   .plugin-setting-content {
diff --git a/packages/common/component/SvgButton.vue b/packages/common/component/SvgButton.vue
index 85b71d9ba..2fcccb5d6 100644
--- a/packages/common/component/SvgButton.vue
+++ b/packages/common/component/SvgButton.vue
@@ -56,14 +56,14 @@ export default {
   justify-content: center;
   align-items: center;
   cursor: pointer;
+  &:hover {
+    color: var(--te-common-icon-hover);
+  }
   &.active {
     color: var(--ti-lowcode-component-svg-button-active-color);
     background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
   }
 
-  & + .svg-button {
-    margin-left: 8px;
-  }
   .svg-icon {
     outline: none;
   }
diff --git a/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue b/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue
index 719bdae34..2e3c9d666 100644
--- a/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue
+++ b/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue
@@ -120,7 +120,6 @@ export default {
         useModal().confirm({
           title: '提示',
           message: '关闭后插槽内的内容将被清空，是否继续？',
-          status: 'info',
           exec: () => {
             slotList.value[idx].bind = false
             operateNode({ type: 'delete', id: slotData[name].value[0].id })
diff --git a/packages/configurator/src/slot-configurator/SlotConfigurator.vue b/packages/configurator/src/slot-configurator/SlotConfigurator.vue
index 057b225f1..91c8b902b 100644
--- a/packages/configurator/src/slot-configurator/SlotConfigurator.vue
+++ b/packages/configurator/src/slot-configurator/SlotConfigurator.vue
@@ -94,7 +94,6 @@ export default {
         useModal().confirm({
           title: '提示',
           message: '关闭后插槽内的内容将被清空，是否继续？',
-          status: 'info',
           exec: () => {
             slotList.value[i].bind = !slotList.value[i].bind
 
diff --git a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
index 3d22853b7..c7fb350cd 100644
--- a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
+++ b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
@@ -179,12 +179,18 @@ const change = (item) => {
         background-color: var(--ti-lowcode-base-gray-101);
         color: var(--te-common-text-primary);
         border-radius: 4px;
+        .svg-icon {
+          color: var(--te-common-text-primary);
+        }
       }
 
       &.selected {
         background-color: var(--ti-lowcode-base-gray-101);
         color: var(--te-common-text-primary);
         border-radius: 4px;
+        .svg-icon {
+          color: var(--te-common-text-primary);
+        }
       }
     }
     .tab-item {
diff --git a/packages/configurator/src/variable-configurator/VariableConfigurator.vue b/packages/configurator/src/variable-configurator/VariableConfigurator.vue
index 5bba722d7..e7e67eab2 100644
--- a/packages/configurator/src/variable-configurator/VariableConfigurator.vue
+++ b/packages/configurator/src/variable-configurator/VariableConfigurator.vue
@@ -21,6 +21,7 @@
           type="info"
           description="你可以通过点击左侧区域变量列表绑定变量或处理函数，也可以在右边输入模式输入复杂的表达式。"
           class="header-alert"
+          :closable="false"
         ></tiny-alert>
       </div>
       <div class="bind-dialog-content">
@@ -85,7 +86,7 @@
               </div>
             </div>
             <div class="bottom lowcode-scrollbar-thin">
-              <h3>用法</h3>
+              <span class="bottom__title">用法</span>
               <div class="bottom-demo">
                 <p>
                   你可以通过点击左侧区域绑定变量或处理函数，或者点击右边的铅笔按钮切换到输入模式，输入复杂的表达式。
@@ -554,7 +555,6 @@ export default {
   .header-alert {
     margin-top: 0;
     margin-bottom: 12px;
-    color: var(--ti-lowcode-meta-bind-variable-header-alert-color);
   }
   .bind-dialog-content {
     display: flex;
@@ -565,11 +565,11 @@ export default {
       width: 38%;
 
       .content-left__title {
-        color: var(--ti-lowcode-meta-bind-variable-content-left-title-color);
+        color: var(--te-common-text-primary);
       }
 
       .list-wrap {
-        border: 1px solid var(--ti-lowcode-meta-bind-variable-list-wrap-border-color);
+        border: 1px solid var(--te-common-border-divider);
         border-radius: 4px;
         height: 300px;
         margin-top: 8px;
@@ -578,8 +578,8 @@ export default {
 
       .content-left__list {
         width: 120px;
-        color: var(--ti-lowcode-meta-bind-variable-content-left-list-color);
-        border-right: 1px solid var(--ti-lowcode-meta-bind-variable-content-left-list-border-right-color);
+        color: var(--te-common-text-secondary);
+        border-right: 1px solid var(--te-common-border-divider);
       }
 
       .content-left__list-item {
@@ -588,21 +588,23 @@ export default {
         transition: background 0.3s;
         &.active,
         &:hover {
-          background: var(--ti-lowcode-meta-bind-variable-list-item-hover-bg-color);
+          background: var(--te-common-bg-container);
+          color: var(--te-common-text-primary);
         }
       }
 
       .item-selected {
-        background-color: var(--ti-lowcode-meta-bind-variable-item-selected-bg-color);
+        background-color: var(--te-common-bg-container);
       }
 
       .item-text {
         padding: 8px 12px;
         cursor: pointer;
-        color: var(--ti-lowcode-meta-bind-variable-item-text-color);
+        color: var(--te-common-text-secondary);
 
         &:hover {
-          background-color: var(--ti-lowcode-meta-bind-variable-item-hover-bg-color);
+          background-color: var(--te-common-bg-container);
+          color: var(--te-common-text-primary);
         }
       }
 
@@ -635,7 +637,7 @@ export default {
       }
 
       .content-right__title {
-        color: var(--ti-lowcode-meta-bind-variable-content-right-title-color);
+        color: var(--te-common-text-primary);
         font-weight: 600;
         margin-right: 5px;
       }
@@ -658,8 +660,8 @@ export default {
           height: 54%;
           border-radius: 4px;
           padding: 12px 8px;
-          color: var(--ti-lowcode-meta-bind-variable-top-color);
-          border: 1px solid var(--ti-lowcode-meta-bind-variable-top-border-color);
+          color: var(--te-common-text-primary);
+          border: 1px solid var(--te-common-border-divider);
           box-sizing: border-box;
           & > div {
             height: 100%;
@@ -695,11 +697,15 @@ export default {
           border-radius: 4px;
           box-sizing: border-box;
           overflow: auto;
-          color: var(--ti-lowcode-meta-bind-variable-bottom-color);
-          border: 1px solid var(--ti-lowcode-meta-bind-variable-bottom-border-color);
+          color: var(--te-common-text-secondary);
+          border: 1px solid var(--te-common-border-divider);
           pre {
             font-family: consolas;
           }
+          .bottom__title {
+            font-weight: var(--te-base-font-weight-6);
+            color: var(--te-common-text-primary);
+          }
         }
       }
     }
@@ -709,6 +715,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    width: 100%;
   }
 }
 </style>
diff --git a/packages/design-core/assets/add-folder.svg b/packages/design-core/assets/add-folder.svg
index 87a99124f..e33cd5d4f 100644
--- a/packages/design-core/assets/add-folder.svg
+++ b/packages/design-core/assets/add-folder.svg
@@ -1,9 +1,17 @@
-<svg width="16.267334" height="16.267334" viewBox="0 0 16.2673 16.2673" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<defs/>
-	<mask id="mask413_10171" mask-type="alpha" maskUnits="userSpaceOnUse" x="0.000000" y="0.000000" width="16.267334" height="16.267334">
-		<rect id="新建文件夹-folder-add" x="0.269531" width="16.000000" height="16.000000" transform="rotate(0.965286 0.269531 0.000000)" fill="currentColor" fill-opacity="1.000000"/>
-	</mask>
-	<g mask="url(#mask413_10171)">
-		<path id="形状结合" d="M5.55 2.26C5.71 2.26 5.88 2.32 6.01 2.44L8.18 4.33L13.1 4.41C13.93 4.42 14.6 5.07 14.66 5.89L14.66 6.02L14.6 9.4C14.6 9.66 14.37 9.89 14.1 9.89C13.82 9.88 13.6 9.65 13.6 9.38L13.63 7.62L2.64 7.43L2.58 11.37C2.56 12.29 3.3 13.06 4.22 13.08L9.68 13.17C9.95 13.17 10.18 13.4 10.17 13.67C10.17 13.96 9.94 14.17 9.66 14.17L4.2 14.08C2.72 14.05 1.55 12.84 1.58 11.36L1.7 3.78C1.71 2.91 2.44 2.21 3.32 2.22L5.55 2.26ZM12.72 10.5C13 10.51 13.22 10.73 13.21 11.01L13.2 11.87L14.06 11.89C14.34 11.89 14.56 12.12 14.55 12.39C14.55 12.66 14.32 12.89 14.04 12.89L13.18 12.87L13.17 13.73C13.16 14.01 12.93 14.23 12.66 14.22C12.38 14.22 12.16 13.99 12.17 13.72L12.18 12.85L11.32 12.84C11.04 12.84 10.82 12.61 10.83 12.33C10.83 12.04 11.06 11.84 11.34 11.84L12.2 11.85L12.21 10.99C12.22 10.72 12.45 10.5 12.72 10.5ZM5.43 3.26L3.3 3.22C3.01 3.22 2.77 3.43 2.7 3.71L2.66 6.43L13.65 6.62L13.66 6.01C13.67 5.68 13.41 5.42 13.08 5.41L8.06 5.32C7.89 5.32 7.71 5.26 7.6 5.15L5.43 3.26Z" fill="#191919" fill-opacity="1.000000" fill-rule="nonzero"/>
-	</g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="形状结合" class="st1" d="M43.9,17.2c1.4,0,2.7,0.5,3.8,1.4l18.1,15.3l40.6,0c6.8,0,12.5,5.2,13.1,11.9l0.1,1.2l0,27.7
+	c0,2.3-1.8,4.2-4.1,4.1c-2.2,0-4.1-1.8-4.1-4.1l0-14.4l-90.7,0l0.1,32.5c0,7.7,6.2,13.8,13.9,13.9l45,0c2.2,0,4.1,1.8,4.1,4.1
+	c0,2.2-1.8,4.1-4.1,4.1l-45,0c-12.2,0-22.1-9.9-22.1-22.2l-0.1-62.4c0-7.3,5.9-13.1,13.1-13.1L43.9,17.2z M104.2,84
+	c2.2,0.1,4.2,1.9,4.1,4.1l0,7.1l7.1,0c2.2,0,4.2,1.8,4.1,4.1c0,2.2-1.8,4.1-4.1,4.1l-7.1,0l0,7.2c0,2.2-1.8,4.1-4.1,4.1
+	c-2.3,0-4.2-1.9-4.2-4.1l0-7.1l-7.1-0.1c-2.3,0-4.2-1.8-4.1-4.1c0-2.2,1.8-4.1,4.1-4.1l7.2,0.1l0-7.2
+	C100.1,85.9,101.9,84.1,104.2,84z M43.1,25.4l-17.6,0c-2.4,0-4.4,1.7-4.8,4l-0.1,0.8l0,21.6l90.7,0v-5c0-2.6-2.2-4.8-4.9-4.9
+	l-41.5,0c-1.4-0.1-2.7-0.5-3.8-1.4L43.1,25.4z"/>
 </svg>
diff --git a/packages/design-core/assets/background-color.svg b/packages/design-core/assets/background-color.svg
index 5a5b78857..93473265e 100644
--- a/packages/design-core/assets/background-color.svg
+++ b/packages/design-core/assets/background-color.svg
@@ -1 +1,15 @@
-<svg data-icon="BackgroundColor" aria-hidden="true" focusable="false" width="16" height="16" viewBox="0 0 16 16"><path fill="currentColor" d="M3 3h10v10H3z"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M15 1H1v14h14V1zm-1 1H2v12h12V2z" fill="currentColor"></path></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor;}
+	.st2{fill:#C2C2C2;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="矩形_193__x28_边框_x29_" class="st1" d="M119.6,37.1c0-13.7-11.1-24.8-24.8-24.8H37.1c-13.7,0-24.8,11.1-24.8,24.8
+	v57.8c0,13.6,11.1,24.8,24.8,24.8h57.8c13.6,0,24.8-11.1,24.8-24.8V37.1z M111.4,37.1c0-9.2-7.4-16.5-16.5-16.5H37.1
+	c-9.2,0-16.5,7.3-16.5,16.5v57.8c0,9.1,7.3,16.5,16.5,16.5h57.8c9.1,0,16.5-7.4,16.5-16.5V37.1z"/>
+<path id="矩形_194" class="st2" d="M41.2,33h49.5c4.6,0,8.2,3.7,8.2,8.2v49.5c0,4.6-3.7,8.2-8.2,8.2H41.2c-4.6,0-8.2-3.7-8.2-8.2
+	V41.2C33,36.7,36.7,33,41.2,33z"/>
+</svg>
diff --git a/packages/design-core/assets/expand_all.svg b/packages/design-core/assets/expand_all.svg
new file mode 100644
index 000000000..deb75e7dd
--- /dev/null
+++ b/packages/design-core/assets/expand_all.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="合并" class="st1" d="M18.6,33c0-2.3,1.8-4.1,4.1-4.1h33c2.3,0,4.1,1.8,4.1,4.1s-1.8,4.1-4.1,4.1h-33
+	C20.4,37.1,18.6,35.3,18.6,33z M112.2,53.5c1.6-1.6,1.6-4.2,0-5.8L96.9,32.4c-0.6-0.6-1.2-1-1.9-1.3c-0.7-0.3-1.4-0.4-2.2-0.4
+	c-0.8,0-1.5,0.1-2.2,0.4c-0.7,0.3-1.3,0.7-1.9,1.3L73.4,47.7c-1.6,1.6-1.6,4.2,0,5.8c1.6,1.6,4.2,1.6,5.8,0L92.8,40l13.6,13.6
+	C108,55.2,110.6,55.2,112.2,53.5z M22.7,61.9c-2.3,0-4.1,1.8-4.1,4.1c0,2.3,1.8,4.1,4.1,4.1h33c2.3,0,4.1-1.8,4.1-4.1
+	c0-2.3-1.8-4.1-4.1-4.1H22.7z M112.2,85.2c1.6-1.6,1.6-4.2,0-5.8c-1.6-1.6-4.2-1.6-5.8,0L92.8,93L79.2,79.4c-1.6-1.6-4.2-1.6-5.8,0
+	c-1.6,1.6-1.6,4.2,0,5.8l15.3,15.3c0.6,0.6,1.2,1,1.9,1.3c0.7,0.3,1.4,0.4,2.2,0.4c0.8,0,1.5-0.1,2.2-0.4c0.7-0.3,1.3-0.7,1.9-1.3
+	L112.2,85.2z M18.6,99c0-2.3,1.8-4.1,4.1-4.1h33c2.3,0,4.1,1.8,4.1,4.1c0,2.3-1.8,4.1-4.1,4.1h-33C20.4,103.1,18.6,101.3,18.6,99z"
+	/>
+</svg>
diff --git a/packages/design-core/assets/global-setting.svg b/packages/design-core/assets/global-setting.svg
new file mode 100644
index 000000000..fdac99a7f
--- /dev/null
+++ b/packages/design-core/assets/global-setting.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="合并" class="st1" d="M112.4,27.8l-36.5-21c-6.2-3.5-13.8-3.5-19.9,0l-36.5,21C13.4,31.3,9.6,38,9.6,45V87
+	c0,7.1,3.8,13.7,10,17.2l36.5,21c3.1,1.7,6.4,2.6,9.9,2.6c3.5,0,6.9-0.9,10-2.6l36.5-21c6.2-3.5,10-10.1,10-17.2V45
+	C122.4,38,118.6,31.3,112.4,27.8z M114.1,87c0,4.1-2.3,8-5.9,10.1l-36.5,21c-3.6,2.1-8.1,2.1-11.6,0l-36.5-21
+	c-3.6-2.1-5.9-5.9-5.9-10.1V45c0-4.1,2.2-7.9,5.9-10.1l36.5-21c1.7-1.1,3.7-1.6,5.8-1.6c2.1,0,4,0.5,5.9,1.6l36.5,21
+	c3.5,2.1,5.9,5.9,5.9,10.1V87z M66,41.3c-13.7,0-24.8,11.1-24.8,24.8S52.3,90.8,66,90.8S90.7,79.7,90.7,66S79.7,41.3,66,41.3z
+	 M66,49.5c-9.1,0-16.5,7.4-16.5,16.5c0,9.1,7.4,16.5,16.5,16.5c9.1,0,16.5-7.4,16.5-16.5C82.5,56.9,75.1,49.5,66,49.5z"/>
+</svg>
diff --git a/packages/design-core/assets/retract_all.svg b/packages/design-core/assets/retract_all.svg
new file mode 100644
index 000000000..2c692a223
--- /dev/null
+++ b/packages/design-core/assets/retract_all.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:currentColor;}
+</style>
+<rect id="size" class="st0" width="132" height="132"/>
+<path id="合并" class="st1" d="M18.6,33c0-2.3,1.8-4.1,4.1-4.1h33c2.3,0,4.1,1.8,4.1,4.1s-1.8,4.1-4.1,4.1h-33
+	C20.4,37.1,18.6,35.3,18.6,33z M112.2,34.2c1.6,1.6,1.6,4.2,0,5.8L96.9,55.4c-0.6,0.6-1.2,1-1.9,1.3c-0.7,0.3-1.4,0.4-2.2,0.4
+	c-0.8,0-1.5-0.1-2.2-0.4c-0.7-0.3-1.3-0.7-1.9-1.3L73.4,40c-1.6-1.6-1.6-4.2,0-5.8c1.6-1.6,4.2-1.6,5.8,0l13.6,13.6l13.6-13.6
+	C108,32.6,110.6,32.6,112.2,34.2z M22.7,61.9c-2.3,0-4.1,1.8-4.1,4.1c0,2.3,1.8,4.1,4.1,4.1h33c2.3,0,4.1-1.8,4.1-4.1
+	c0-2.3-1.8-4.1-4.1-4.1H22.7z M112.2,92c1.6,1.6,1.6,4.2,0,5.8c-1.6,1.6-4.2,1.6-5.8,0L92.8,84.2L79.2,97.8c-1.6,1.6-4.2,1.6-5.8,0
+	c-1.6-1.6-1.6-4.2,0-5.8l15.3-15.3c0.6-0.6,1.2-1,1.9-1.3c0.7-0.3,1.4-0.4,2.2-0.4c0.8,0,1.5,0.1,2.2,0.4c0.7,0.3,1.3,0.7,1.9,1.3
+	L112.2,92z M18.6,99c0-2.3,1.8-4.1,4.1-4.1h33c2.3,0,4.1,1.8,4.1,4.1c0,2.3-1.8,4.1-4.1,4.1h-33C20.4,103.1,18.6,101.3,18.6,99z"/>
+</svg>
diff --git a/packages/layout/src/DesignPlugins.vue b/packages/layout/src/DesignPlugins.vue
index 27b7c9ee6..19adc16b3 100644
--- a/packages/layout/src/DesignPlugins.vue
+++ b/packages/layout/src/DesignPlugins.vue
@@ -257,7 +257,7 @@ export default {
 
     &.bottom {
       flex: 1;
-      padding-bottom: 20px;
+      padding-bottom: 28px;
     }
 
     .list-item {
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index 17e7d4f37..4554783c7 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -36,7 +36,7 @@ export default {
     const activating = computed(() => layoutState.settings.activating)
     const showMask = ref(true)
     const isCollapsed = ref(false)
-    const settingIcon = computed(() => (isCollapsed.value ? 'style-panel-collapsed' : 'style-panel-expand'))
+    const settingIcon = computed(() => (isCollapsed.value ? 'retract_all' : 'expand_all'))
 
     provide('isCollapsed', isCollapsed)
 
diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue
index 25c13f204..e932f9bc1 100644
--- a/packages/plugins/block/src/BlockConfig.vue
+++ b/packages/plugins/block/src/BlockConfig.vue
@@ -1,5 +1,12 @@
 <template>
-  <tiny-form ref="blockForm" class="block-setting-content" label-position="top" :model="formData" :rules="rules">
+  <tiny-form
+    ref="blockForm"
+    class="block-setting-content"
+    label-position="top"
+    :model="formData"
+    :rules="rules"
+    validate-type="text"
+  >
     <tiny-form-item label="区块名称" prop="name_cn">
       <div>
         <tiny-input
@@ -59,7 +66,7 @@
         >
         </tiny-input>
         <tiny-button v-show="!state.inputVisible" class="button-new-tag" size="small" @click="addTag">
-          + 标签
+          <svg-icon name="add"></svg-icon>标签
         </tiny-button>
       </div>
       <div class="global-desc-info">区块的功能以及特性标签，例如表格、购买页、过滤等</div>
@@ -284,9 +291,6 @@ export default {
 
 <style lang="less" scoped>
 .block-setting-content {
-  :deep(.tiny-form-item__error) {
-    display: none;
-  }
   :deep(.tiny-form-item) {
     margin-bottom: 10px;
   }
@@ -299,7 +303,7 @@ export default {
     font-size: 12px;
   }
   .global-desc-info {
-    font-size: 11px;
+    font-size: 12px;
   }
 }
 
diff --git a/packages/plugins/block/src/BlockEventList.vue b/packages/plugins/block/src/BlockEventList.vue
index 8b496e27a..f3e5e8d28 100644
--- a/packages/plugins/block/src/BlockEventList.vue
+++ b/packages/plugins/block/src/BlockEventList.vue
@@ -2,15 +2,15 @@
   <div class="add-button">
     <tiny-button @click="addEvent"> <svg-icon name="add"></svg-icon>添加</tiny-button>
   </div>
-  <meta-list-items class="list" :optionsList="list" :draggable="false">
+  <meta-list-items :class="{ list: list.length }" :optionsList="list" :draggable="false">
     <template #content="{ data }">
       <div :class="{ 'item-text': true, active: data.name === currentEventName }" @click="setEdit(data)">
         {{ data.name }}
       </div>
     </template>
     <template #operate="{ data }">
-      <svg-button class="opt-button" :hoverBgColor="false" name="to-edit" @click="setEdit(data)"></svg-button>
-      <svg-button class="opt-button" :hoverBgColor="false" name="delete" @click="delBlockEvent(data.name)"></svg-button>
+      <svg-button :hoverBgColor="false" name="to-edit" @click="setEdit(data)"></svg-button>
+      <svg-button :hoverBgColor="false" name="delete" @click="delBlockEvent(data.name)"></svg-button>
     </template>
   </meta-list-items>
 </template>
@@ -60,7 +60,7 @@ export default {
 
 <style lang="less" scoped>
 .list {
-  margin-bottom: 8px;
+  margin-top: 12px;
   overflow: auto;
 }
 
@@ -76,7 +76,6 @@ export default {
   margin-left: 8px;
 }
 .add-button {
-  padding: 0 0 8px 0;
   :deep(.tiny-button) {
     border: 1px solid var(--ti-lowcode-base-default-button-border-disable-color);
   }
diff --git a/packages/plugins/block/src/BlockPropertyList.vue b/packages/plugins/block/src/BlockPropertyList.vue
index 476ae54da..c0b9413f4 100644
--- a/packages/plugins/block/src/BlockPropertyList.vue
+++ b/packages/plugins/block/src/BlockPropertyList.vue
@@ -5,15 +5,15 @@
       <span>添加</span>
     </tiny-button>
   </div>
-  <meta-list-items class="property-list" :optionsList="list">
+  <meta-list-items :class="{ 'property-list': list.length }" :optionsList="list">
     <template #content="{ data }">
       <div :class="{ 'item-text': true }">
         {{ data.property }}
       </div>
     </template>
     <template #operate="{ data }">
-      <svg-button name="to-edit" class="opt-button" :hoverBgColor="false" @click="handleEdit(data)"></svg-button>
-      <svg-button name="delete" class="opt-button" :hoverBgColor="false" @click="del(data)"></svg-button>
+      <svg-button name="to-edit" :hoverBgColor="false" @click="handleEdit(data)"></svg-button>
+      <svg-button name="delete" :hoverBgColor="false" @click="del(data)"></svg-button>
     </template>
   </meta-list-items>
 </template>
@@ -69,7 +69,7 @@ export default {
   max-height: 222px;
   overflow-y: auto;
   padding: 1px 0; // 解决因为子元素加上了border之后，在高度小于222px之前高度永远>property-list, 导致滚动条一直出现的问题
-  margin-bottom: 8px;
+  margin-top: 12px;
 }
 
 .item-text {
@@ -86,7 +86,6 @@ export default {
 
 .add-button {
   display: flex;
-  padding-bottom: 16px;
   :deep(.tiny-button) {
     padding: 0 12px;
     width: 66px;
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index 2b347c2ce..639fc6d80 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -69,6 +69,7 @@
           <block-history-list
             :is-block-manage="true"
             :history="state.backupList"
+            :lastVersion="state.lastVersion"
             @preview="previewHistory"
           ></block-history-list>
         </tiny-collapse-item>
@@ -154,6 +155,7 @@ export default {
     const state = reactive({
       activeName: ['base', 'attribute', 'event', 'lifeCycle', 'history'],
       backupList: [],
+      lastVersion: {},
       showDeployBlock: false,
       bindLifeCycles: {},
       showAttributeGuide: false,
@@ -174,6 +176,7 @@ export default {
 
         if (block?.id) {
           state.backupList = block.histories
+          state.lastVersion = block.last_build_info
         }
       }
     )
@@ -292,22 +295,10 @@ export default {
 .plugin-block-setting {
   :deep(.plugin-setting-header) {
     border: 0;
-    .button-group {
-      column-gap: 2px;
-    }
-    .tiny-button {
-      width: 40px;
-      padding: 0;
-      min-width: 40px;
-      margin-right: 2px;
-    }
     .close-plugin-setting-icon {
       margin-left: 4px;
     }
   }
-  .publish-btn {
-    margin-right: 8px;
-  }
 
   .video-close {
     font-size: 16px;
@@ -337,10 +328,6 @@ export default {
     }
   }
 
-  .life-cycles-container {
-    padding: 0 0 12px 0;
-  }
-
   .block-attribute,
   .block-event {
     position: relative;
@@ -377,5 +364,8 @@ export default {
       color: var(--ti-lowcode-block-video-tip-color);
     }
   }
+  :deep(.tiny-collapse-item__content) {
+    padding: 0 12px 12px;
+  }
 }
 </style>
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index 40bca495e..89e4cba83 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -51,17 +51,17 @@
                   @update:modelValue="handleChangeDeletePopoverVisible"
                 >
                   <div class="popper-confirm" @mousedown.stop="">
-                    <div class="popper-confirm-header">
-                      <svg-icon class="icon" name="warning"></svg-icon>
+                    <div class="popper-confirm-header">删除</div>
+                    <div class="popper-confirm-content">
                       <span class="title">{{ groupLabels.deletePrompt }}</span>
                     </div>
                     <div class="popper-confirm-footer">
-                      <tiny-button class="confirm-btn" size="small" type="primary" @click="delCategory(item.id)"
-                        >确定</tiny-button
-                      >
                       <tiny-button class="cancel-btn" size="small" @click="handleShowDeleteModal(null)"
                         >取消</tiny-button
                       >
+                      <tiny-button class="confirm-btn" size="small" type="primary" @click="delCategory(item.id)"
+                        >确定</tiny-button
+                      >
                     </div>
                   </div>
                   <template #reference>
@@ -574,25 +574,26 @@ export default {
     }
   }
 
-  .popper-confirm {
-    padding: 20px;
-  }
-
   .popper-confirm-header {
+    font-size: var(--te-base-font-size-1);
+    color: var(--te-common-text-primary);
+    font-weight: var(--te-base-font-weight-7);
+    margin-bottom: 12px;
+  }
+  .popper-confirm-content {
     font-size: 12px;
-    color: var(--ti-lowcode-materials-block-group-delete-popover-title-color);
-    .icon {
-      color: var(--ti-lowcode-warning-color);
-      width: 16px;
-      height: 16px;
-    }
-    .title {
-      margin-left: 4px;
-    }
+    color: var(--te-common-text-secondary);
   }
   .popper-confirm-footer {
-    text-align: center;
-    margin-top: 22px;
+    text-align: right;
+    margin-top: 16px;
+    .tiny-button {
+      min-width: 40px;
+      margin-right: 0;
+      & + .tiny-button {
+        margin-left: 8px;
+      }
+    }
   }
 }
 .tiny-dropdown-menu.tiny-dropdown-menu {
diff --git a/packages/plugins/bridge/src/BridgeManage.vue b/packages/plugins/bridge/src/BridgeManage.vue
index 7d4990295..836f38c06 100644
--- a/packages/plugins/bridge/src/BridgeManage.vue
+++ b/packages/plugins/bridge/src/BridgeManage.vue
@@ -14,9 +14,14 @@
         :class="['list-item', index === state.activeIndex ? 'active' : '']"
         @click.stop="openEdit(item, index)"
       >
-        <svg-icon name="plugin-icon-sresources"></svg-icon>
+        <svg-icon name="plugin-icon-sresources" class="list-item-icon"></svg-icon>
         <div class="item-label">{{ item.name }}</div>
-        <svg-icon class="setting-icon" name="setting" @click.stop="openEdit(item, index)"></svg-icon>
+        <svg-button
+          class="setting-icon"
+          :hoverBgColor="false"
+          name="setting"
+          @click.stop="openEdit(item, index)"
+        ></svg-button>
       </div>
       <search-empty :isShow="!list.length" />
     </div>
@@ -27,7 +32,7 @@
 import { watchEffect, ref, reactive } from 'vue'
 import { Search } from '@opentiny/vue'
 import { iconSearch } from '@opentiny/vue-icon'
-import { SearchEmpty } from '@opentiny/tiny-engine-common'
+import { SearchEmpty, SvgButton } from '@opentiny/tiny-engine-common'
 import {
   RESOURCE_TYPE,
   ACTION_TYPE,
@@ -44,7 +49,8 @@ export default {
   components: {
     TinySearch: Search,
     TinyIconSearch: iconSearch(),
-    SearchEmpty
+    SearchEmpty,
+    SvgButton
   },
   props: {
     name: {
@@ -160,13 +166,16 @@ export default {
     &.active {
       background: var(--ti-lowcode-bridge-list-bg);
       .setting-icon {
-        display: block;
+        display: grid;
       }
     }
 
     .setting-icon {
       display: none;
-      color: var(--ti-lowcode-toolbar-more-hover-color);
+    }
+    .list-item-icon {
+      color: var(--te-common-icon-secondary);
+      margin-right: 8px;
     }
   }
 }
diff --git a/packages/plugins/bridge/src/BridgeSetting.vue b/packages/plugins/bridge/src/BridgeSetting.vue
index 47b799801..4ca462c04 100644
--- a/packages/plugins/bridge/src/BridgeSetting.vue
+++ b/packages/plugins/bridge/src/BridgeSetting.vue
@@ -6,11 +6,11 @@
       </div>
     </template>
     <template #header>
-      <div class="header-wrap">
+      <button-group>
         <tiny-button class="save-btn" type="primary" @click="save">保存</tiny-button>
-        <svg-button v-show="state.status" class="delete-btn" name="delete" @click="deleteReSource"></svg-button>
+        <svg-button v-if="state.status" class="delete-btn" name="delete" @click="deleteReSource"></svg-button>
         <svg-button class="close-btn" name="close" @click="closePanel"></svg-button>
-      </div>
+      </button-group>
     </template>
     <template #content>
       <tiny-form
@@ -111,7 +111,7 @@ import {
   getActionType,
   getResourceNamesByType
 } from './js/resource'
-import { VueMonaco as MonacoEditor, PluginSetting, SvgButton } from '@opentiny/tiny-engine-common'
+import { VueMonaco as MonacoEditor, PluginSetting, SvgButton, ButtonGroup } from '@opentiny/tiny-engine-common'
 import { useModal, useNotify, getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
 
@@ -137,7 +137,8 @@ export default {
     MonacoEditor,
     TinyRadioGroup: RadioGroup,
     TinyRadio: Radio,
-    SvgButton
+    SvgButton,
+    ButtonGroup
   },
   setup(props, { emit }) {
     const monacoOptions = {
@@ -220,11 +221,6 @@ export default {
 
       resourceForm.value.validate((valid) => {
         if (!valid) {
-          useNotify({
-            type: 'error',
-            message: '请检查必填项'
-          })
-
           return
         }
 
diff --git a/packages/plugins/datasource/src/DataSourceField.vue b/packages/plugins/datasource/src/DataSourceField.vue
index 719f76392..a2fc6a257 100644
--- a/packages/plugins/datasource/src/DataSourceField.vue
+++ b/packages/plugins/datasource/src/DataSourceField.vue
@@ -157,6 +157,9 @@ export default {
       text-decoration: underline;
       font-weight: normal;
     }
+    .tiny-button + .tiny-button {
+      margin-left: 4px;
+    }
   }
 
   .section {
diff --git a/packages/plugins/datasource/src/DataSourceFieldForm.vue b/packages/plugins/datasource/src/DataSourceFieldForm.vue
index 80dcc828b..464be12f8 100644
--- a/packages/plugins/datasource/src/DataSourceFieldForm.vue
+++ b/packages/plugins/datasource/src/DataSourceFieldForm.vue
@@ -189,11 +189,8 @@ export default {
     justify-content: space-between;
     align-items: center;
     .tiny-button {
-      width: 40px;
-      padding: 0;
-      min-width: 40px;
-      margin-right: 2px;
       border: 1px solid var(--ti-lowcode-datasource-color);
+      margin-right: 0px;
     }
   }
 
diff --git a/packages/plugins/datasource/src/DataSourceForm.vue b/packages/plugins/datasource/src/DataSourceForm.vue
index 4ccb0b44b..cf74f033c 100644
--- a/packages/plugins/datasource/src/DataSourceForm.vue
+++ b/packages/plugins/datasource/src/DataSourceForm.vue
@@ -3,11 +3,9 @@
     <template #header>
       <button-group>
         <tiny-button class="field-save" type="primary" @click="save">保存</tiny-button>
-        <div class="field-handler" @click="deleteDataSource" v-if="editable" tips="删除">
-          <svg-button name="delete"></svg-button>
-        </div>
+        <svg-button name="delete" v-if="editable" @click="deleteDataSource"></svg-button>
+        <svg-button name="close" @click="closeAllPanel"></svg-button>
       </button-group>
-      <svg-button class="close-plugin-setting-icon" name="close" @click="closeAllPanel"></svg-button>
     </template>
     <template #content>
       <tiny-form label-width="0">
@@ -254,19 +252,6 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.data-source-form {
-  .button-group {
-    column-gap: 6px;
-    .tiny-button {
-      width: 40px;
-      padding: 0;
-      min-width: 40px;
-    }
-  }
-  .close-plugin-setting-icon {
-    margin-left: 4px;
-  }
-}
 .datasource-form-footer {
   padding: 12px;
   .tiny-svg {
diff --git a/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue b/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue
index cadc2bb2c..c2b0a8f17 100644
--- a/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue
+++ b/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue
@@ -112,8 +112,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-}
-.is-active {
-  flex-grow: 2;
+  .tiny-collapse-item:first-child {
+    border-top: 0;
+  }
+  :deep(.tiny-collapse-item__content) {
+    padding: 0 0 12px;
+  }
 }
 </style>
diff --git a/packages/plugins/datasource/src/DataSourceList.vue b/packages/plugins/datasource/src/DataSourceList.vue
index c5b5ecd53..bed1f7f52 100644
--- a/packages/plugins/datasource/src/DataSourceList.vue
+++ b/packages/plugins/datasource/src/DataSourceList.vue
@@ -8,7 +8,7 @@
       >
         <div class="item-label">
           <div class="item-name">
-            <svg-button name="plugin-icon-data" class="plugin-icon-data"> </svg-button>
+            <svg-icon name="plugin-icon-data" class="plugin-icon-data"> </svg-icon>
             {{ item.name }}
           </div>
           <div class="item-handler">
@@ -24,7 +24,7 @@
               class="set-page"
               :hoverBgColor="false"
               tips="设置数据源"
-              name="text-source-setting"
+              name="setting"
               @mousedown.stop.prevent="openDataSourceForm(item, index)"
             >
             </svg-button>
@@ -163,23 +163,14 @@ export default {
         align-items: center;
       }
       .plugin-icon-data {
+        color: var(--te-common-icon-secondary);
         margin-right: 8px;
-        width: 18px;
       }
     }
     .item-handler {
       height: 24px;
       line-height: 24px;
       display: none;
-      .svg-button {
-        width: 16px;
-        height: 16px;
-        margin-top: 6px;
-        color: var(--ti-lowcode-datasource-toolbar-more-hover-color);
-        &:hover {
-          color: var(--ti-lowcode-toolbar-icon-color);
-        }
-      }
     }
   }
 }
diff --git a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
index 1eb2103f4..c510c6e94 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
@@ -115,7 +115,10 @@ export default {
     z-index: 9999;
     .tiny-button {
       border-radius: 4px;
-      border-color: var(--te-common-border-default);
+      border-color: var(--te-common-border-secondary);
+      & + .tiny-button {
+        margin-left: 4px;
+      }
     }
   }
 
diff --git a/packages/plugins/datasource/src/Main.vue b/packages/plugins/datasource/src/Main.vue
index 2f4771218..23e49fbcf 100644
--- a/packages/plugins/datasource/src/Main.vue
+++ b/packages/plugins/datasource/src/Main.vue
@@ -5,13 +5,13 @@
       <svg-button
         class="set-data-source"
         tips="全局设置"
-        name="text-source-setting"
+        name="global-setting"
         @click="openGlobalDataHanderPanel"
       ></svg-button>
       <svg-button
         class="refresh-data-source"
         tips="刷新数据源"
-        name="text-source-list-ref"
+        name="flow-refresh"
         @click="refreshDataSource"
       ></svg-button>
     </template>
@@ -146,12 +146,6 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.set-data-source,
-.refresh-data-source {
-  width: 16px;
-  margin-right: 6px !important;
-  color: var(--ti-lowcode-datasource-btn-click-color);
-}
 .add-data-source {
   margin: 0 12px 12px 12px;
 }
diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue
index bf396e08b..9b38b5104 100644
--- a/packages/plugins/help/src/HelpIcon.vue
+++ b/packages/plugins/help/src/HelpIcon.vue
@@ -1,12 +1,13 @@
 <template>
   <div id="help-plugin">
     <tiny-popover
-      :offset="50"
+      :offset="-100"
       placement="right"
       width="208"
       trigger="click"
       :visible-arrow="false"
       id="help-icon-popover"
+      :key="offset"
     >
       <template #reference>
         <div title="帮助" class="help-plugin-reference">
@@ -81,7 +82,7 @@ export default {
 
     const tinyGuideRef = ref()
     const toolTipContent = '点击这里，再次查看新手指引'
-    const helpTitle = '帮助'
+    const helpTitle = '帮助与指引'
     const questionTitle = '常见问题'
     const courseUrl = 'https://opentiny.design/tiny-engine#/help-center/course/engine'
     const questionList = [
@@ -340,7 +341,7 @@ div.tiny-guide.shepherd-element {
   cursor: auto;
   background-color: var(--ti-lowcode-help-box-bg-color);
   border-radius: 6px;
-  padding: 16px 0;
+  padding: 4px 0;
   &-top {
     text-align: right;
   }
@@ -349,13 +350,12 @@ div.tiny-guide.shepherd-element {
     font-size: 12px;
     font-weight: 600;
     line-height: 18px;
-    margin: 0 8px 8px 8px;
+    margin: 0 0 8px;
   }
   &-body {
     padding-bottom: 8px;
   }
   &-item {
-    padding: 0 8px;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -363,7 +363,9 @@ div.tiny-guide.shepherd-element {
     height: 28px;
     line-height: 28px;
     font-size: 12px;
-    color: var(--ti-lowcode-help-box-item-text-color);
+    margin: 0 -16px;
+    padding: 0 16px;
+    color: var(--te-common-text-primary);
     span {
       display: flex;
       align-items: center;
@@ -374,7 +376,6 @@ div.tiny-guide.shepherd-element {
   }
   &-item:hover {
     background: var(--ti-lowcode-help-box-item-hover-bg-color);
-    color: var(--ti-lowcode-help-box-title-text-color);
   }
 
   &-ques {
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
index abf841d96..14f631dba 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
@@ -73,11 +73,18 @@
               @update:modelValue="handleChangeDeletePopoverVisible"
             >
               <div class="popper-confirm" @mousedown.stop="">
-                <div class="popper-confirm-header">
-                  <svg-icon class="icon" name="warning"></svg-icon>
+                <div class="popper-confirm-header">删除</div>
+                <div class="popper-confirm-content">
                   <span class="title">您确定删除该分组吗？</span>
                 </div>
                 <div class="popper-confirm-footer">
+                  <tiny-button
+                    id="cancelDeleteGroupName"
+                    size="small"
+                    class="cancel-btn"
+                    @click="handleCancelDeleteGroup"
+                    >取消</tiny-button
+                  >
                   <tiny-button
                     id="confirmDeleteGroupName"
                     class="confirm-btn"
@@ -87,13 +94,6 @@
                   >
                     确定
                   </tiny-button>
-                  <tiny-button
-                    id="cancelDeleteGroupName"
-                    size="small"
-                    class="cancel-btn"
-                    @click="handleCancelDeleteGroup"
-                    >取消</tiny-button
-                  >
                 </div>
               </div>
               <template #reference>
@@ -486,25 +486,26 @@ export default {
     }
   }
 
-  .popper-confirm {
-    padding: 20px;
-  }
-
   .popper-confirm-header {
+    font-size: var(--te-base-font-size-1);
+    color: var(--te-common-text-primary);
+    font-weight: var(--te-base-font-weight-7);
+    margin-bottom: 12px;
+  }
+  .popper-confirm-content {
     font-size: 12px;
-    color: var(--ti-lowcode-materials-block-group-delete-popover-title-color);
-    .icon {
-      color: var(--ti-lowcode-warning-color);
-      width: 16px;
-      height: 16px;
-    }
-    .title {
-      margin-left: 4px;
-    }
+    color: var(--te-common-text-secondary);
   }
   .popper-confirm-footer {
-    text-align: center;
-    margin-top: 22px;
+    text-align: right;
+    margin-top: 16px;
+    .tiny-button {
+      min-width: 40px;
+      margin-right: 0;
+      & + .tiny-button {
+        margin-left: 8px;
+      }
+    }
   }
 }
 </style>
diff --git a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
index 928b6f97d..0a318dd6e 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
@@ -1,10 +1,14 @@
 <template>
   <plugin-setting v-if="panel.created" v-show="panel.show" :title="state.title" class="version-list-panel">
     <template #header>
-      <close-icon class="close-icon" @click="closePanel"></close-icon>
+      <button-group>
+        <tiny-button type="primary" @click="handleConfirm">确定</tiny-button>
+        <svg-button name="close" @click="closePanel"></svg-button>
+      </button-group>
     </template>
     <template #content>
       <tiny-grid ref="versionGrid" :data="state.backupList" :highlight-hover-row="false">
+        <tiny-grid-column type="radio" width="40"></tiny-grid-column>
         <tiny-grid-column field="version" title="版本号"></tiny-grid-column>
         <tiny-grid-column title="发布时间">
           <template v-slot="{ row }">
@@ -12,17 +16,6 @@
           </template>
         </tiny-grid-column>
         <tiny-grid-column field="message" title="发布描述"></tiny-grid-column>
-        <tiny-grid-column title="操作">
-          <template v-slot="{ row }">
-            <tiny-button
-              type="text"
-              text="回退"
-              class="fallback-btn"
-              :disabled="isCurrentVersion(row)"
-              @click="handleChangeVersion(row)"
-            ></tiny-button
-          ></template>
-        </tiny-grid-column>
         <template #empty>
           <search-empty :isShow="true" />
         </template>
@@ -35,7 +28,7 @@
 import { reactive, watch, ref } from 'vue'
 import { Grid, GridColumn, Button } from '@opentiny/vue'
 import { format } from '@opentiny/vue-renderless/common/date'
-import { PluginSetting, CloseIcon, SearchEmpty } from '@opentiny/tiny-engine-common'
+import { PluginSetting, SearchEmpty, ButtonGroup, SvgButton } from '@opentiny/tiny-engine-common'
 import { useBlock, useModal, useMaterial, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { fetchBlockById, requestGroupBlockVersion } from './http'
 import { useVersionSelectPanel } from './js/usePanel'
@@ -46,8 +39,9 @@ export default {
     TinyGridColumn: GridColumn,
     TinyButton: Button,
     PluginSetting,
-    CloseIcon,
-    SearchEmpty
+    SearchEmpty,
+    ButtonGroup,
+    SvgButton
   },
   setup() {
     const { confirm } = useModal()
@@ -65,6 +59,11 @@ export default {
       fetchBlockById(selectedBlock.value.id)
         .then((data) => {
           state.backupList = data.histories?.reverse?.() || []
+          state.backupList.forEach((item, index) => {
+            if (item.version === selectedBlock.value.current_version) {
+              versionGrid.value?.setRadioRow(state.backupList[index])
+            }
+          })
         })
         .catch((error) => {
           message({ message: `获取区块版本失败: ${error.message || error}`, title: '区块版本获取失败' })
@@ -103,6 +102,10 @@ export default {
       }
     }
 
+    const handleConfirm = () => {
+      handleChangeVersion(versionGrid.value?.getRadioRow())
+    }
+
     watch([() => panel.show, () => selectedBlock.value], ([panelShow]) => {
       if (panelShow) {
         state.title = `选择版本(${selectedBlock.value.label})`
@@ -123,7 +126,8 @@ export default {
       closePanel,
       format,
       isCurrentVersion,
-      handleChangeVersion
+      handleChangeVersion,
+      handleConfirm
     }
   }
 }
diff --git a/packages/plugins/page/src/PageFolderSetting.vue b/packages/plugins/page/src/PageFolderSetting.vue
index bebb97815..fc9308c7b 100644
--- a/packages/plugins/page/src/PageFolderSetting.vue
+++ b/packages/plugins/page/src/PageFolderSetting.vue
@@ -215,17 +215,6 @@ export default {
 .pageFolder-plugin-setting {
   :deep(.plugin-setting-header) {
     border: 0;
-    .close-plugin-setting-icon {
-      margin-left: 8px;
-    }
-    .button-group {
-      column-gap: 2px;
-      .tiny-button {
-        width: 40px;
-        padding: 0;
-        min-width: 40px;
-      }
-    }
   }
   :deep(.plugin-setting-content) {
     padding: 0 0 16px 0;
diff --git a/packages/plugins/page/src/PageGeneral.vue b/packages/plugins/page/src/PageGeneral.vue
index c141518e1..bbe4f87c5 100644
--- a/packages/plugins/page/src/PageGeneral.vue
+++ b/packages/plugins/page/src/PageGeneral.vue
@@ -249,10 +249,6 @@ export default {
         font-size: 12px;
         color: var(--ti-lowcode-page-manage-text-color);
       }
-      .tiny-form-item__error {
-        font-size: 14px;
-        color: var(--ti-lowcode-page-manage-error-color);
-      }
     }
   }
   .tip {
diff --git a/packages/plugins/page/src/PageSetting.vue b/packages/plugins/page/src/PageSetting.vue
index b3568420c..70b6764b9 100644
--- a/packages/plugins/page/src/PageSetting.vue
+++ b/packages/plugins/page/src/PageSetting.vue
@@ -11,7 +11,7 @@
           @click="copyPage"
         ></svg-button>
         <svg-button v-if="!pageSettingState.isNew" name="delete" tips="删除页面" @click="deletePage"></svg-button>
-        <svg-button class="close-plugin-setting-icon" name="close" @click="cancelPageSetting"></svg-button>
+        <svg-button name="close" @click="cancelPageSetting"></svg-button>
       </button-group>
     </template>
 
@@ -44,7 +44,7 @@
             </div>
           </tiny-collapse-item>
 
-          <tiny-collapse-item class="history-source" title="历史备份" :name="PAGE_SETTING_SESSION.history">
+          <tiny-collapse-item class="history-source" title="版本列表" :name="PAGE_SETTING_SESSION.history">
             <page-history @restorePage="restorePage"></page-history>
           </tiny-collapse-item>
         </tiny-collapse>
@@ -293,7 +293,6 @@ export default {
 
     const createHistoryMessage = () => {
       const title = '创建历史备份信息'
-      const status = 'custom'
       const messageRender = {
         render: () => <Input placeholder="历史备份信息" v-model={state.historyMessage}></Input>
       }
@@ -309,7 +308,7 @@ export default {
         state.historyMessage = ''
       }
 
-      confirm({ title, status, message: messageRender, exec })
+      confirm({ title, message: messageRender, exec })
     }
 
     const savePageSetting = () => {
@@ -408,18 +407,6 @@ export default {
 .page-plugin-setting {
   :deep(.plugin-setting-header) {
     border: 0;
-    .button-group {
-      column-gap: 2px;
-      .tiny-button {
-        width: 40px;
-        padding: 0;
-        min-width: 40px;
-        margin-right: 2px;
-      }
-    }
-    .close-plugin-setting-icon {
-      margin-left: 4px;
-    }
   }
 
   :deep(.plugin-setting-content) {
@@ -431,10 +418,6 @@ export default {
   }
 }
 
-.life-cycles-container {
-  padding: 0 0 12px 0;
-}
-
 .page-setting-collapse {
   :deep(.tiny-collapse-item__header) {
     &,
@@ -448,5 +431,8 @@ export default {
       margin-right: 6px;
     }
   }
+  :deep(.tiny-collapse-item__content) {
+    padding: 0 12px 12px;
+  }
 }
 </style>
diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 94466026b..ca209df5a 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -53,6 +53,7 @@ import { constants } from '@opentiny/tiny-engine-utils'
 import { closePageSettingPanel } from './PageSetting.vue'
 import { closeFolderSettingPanel } from './PageFolderSetting.vue'
 import http from './http.js'
+import { SvgButton } from '@opentiny/tiny-engine-common'
 
 const { ELEMENT_TAG, PAGE_STATUS, COMPONENT_NAME } = constants
 
@@ -281,18 +282,22 @@ export default {
           <span class="label">{node.label}</span>
           <span class="icons">
             {data.isPage && isPageLocked ? (
-              <SvgIcon
+              <SvgButton
                 class="page-edit-icon"
                 name="locked"
+                hoverBgColor={false}
                 onMousedown={(e) => openSettingPanel(e, node, isPageLocked)}
-              ></SvgIcon>
+              ></SvgButton>
             ) : null}
-            {data.isHome ? <SvgIcon class="page-edit-icon" name="text-page-home"></SvgIcon> : null}
-            <SvgIcon
+            {data.isHome ? (
+              <SvgButton class="page-edit-icon" hoverBgColor={false} name="text-page-home"></SvgButton>
+            ) : null}
+            <SvgButton
               name="setting"
               class="setting page-edit-icon"
+              hoverBgColor={false}
               onMousedown={(e) => openSettingPanel(e, node, isPageLocked)}
-            ></SvgIcon>
+            ></SvgButton>
           </span>
         </span>
       )
@@ -345,7 +350,8 @@ export default {
       getPageTreeRefs,
       IconFolderOpened: IconFolderOpened(),
       IconFolderClosed: IconFolderClosed(),
-      nullIcon
+      nullIcon,
+      SvgButton
     }
   }
 }
@@ -374,9 +380,6 @@ export default {
         border: none;
       }
     }
-    .title {
-      margin-left: 6px;
-    }
   }
   :deep(.tiny-collapse-item) {
     border-left: 0;
@@ -394,40 +397,33 @@ export default {
 }
 
 .app-manage-tree {
-  :deep(.tiny-tree) {
+  :deep(.tiny-tree.tiny-tree.tiny-tree) {
+    .tiny-tree-node__content-left {
+      padding: 0;
+      .tiny-tree-node__content-box {
+        padding: 0 12px;
+      }
+    }
     .tiny-tree-node__label {
       font-size: 12px;
       display: flex;
       align-items: center;
       flex: 1;
 
-      & > .svg-icon {
-        margin-right: 4px;
-      }
-      .svg-icon {
-        color: var(--te-common-icon-secondary);
-      }
       & .label {
         font-size: 12px;
         flex: 1;
       }
+      .icon-page,
+      .folder-icon {
+        color: var(--te-common-icon-secondary);
+        margin-right: 8px;
+      }
     }
 
     .tree-node-icon {
       margin-right: 0;
     }
-
-    .svg-icon {
-      width: 14px;
-      height: 14px;
-    }
-
-    .icons {
-      display: flex;
-      align-items: center;
-      gap: 4px;
-    }
-
     .tiny-tree-node.is-leaf .tiny-tree-node__content {
       padding-left: 0;
     }
diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue
index 89d82b461..94446338c 100644
--- a/packages/plugins/robot/src/Main.vue
+++ b/packages/plugins/robot/src/Main.vue
@@ -8,10 +8,10 @@
         <div class="bind-chatgpt" id="bind-chatgpt">
           <section>
             <div class="chat-title-icons">
-              <svg-icon name="close" class="common-svg" @click="robotVisible = false"></svg-icon>
+              <svg-icon name="close" class="common-svg opt-button" @click="robotVisible = false"></svg-icon>
               <svg-icon
                 :name="chatWindowOpened ? 'chat-maximize' : 'chat-minimize'"
-                class="common-svg"
+                class="common-svg opt-button"
                 @click="resizeChatWindow"
               ></svg-icon>
             </div>
@@ -40,12 +40,18 @@
               <div class="robot-dialog-content-top-title">我是你的开发小助手</div>
               <span class="robot-dialog-content-top-icon"><svg-icon name="AI" class="icon-ai"></svg-icon>智能对话</span>
               <article class="chat-tips">
-                <span>需要一个注册表单？</span>
+                <span @click="sendContent('需要一个注册表单？', true)">需要一个注册表单？</span>
                 <span @click="sendContent('如何将表单嵌进我的网站？', true)">如何将表单嵌进我的网站？</span>
-                <span>需要一个注册表单？</span>
               </article>
             </div>
-            <article class="chat-window lowcode-scrollbar-hide" id="chatgpt-window">
+            <article
+              :class="[
+                'chat-window',
+                'lowcode-scrollbar-hide',
+                chatWindowOpened ? 'max-chat-window' : 'min-chat-window'
+              ]"
+              id="chatgpt-window"
+            >
               <tiny-layout>
                 <tiny-row
                   v-for="(item, index) in activeMessages"
@@ -55,7 +61,12 @@
                   :justify="item.role === 'user' ? 'end' : 'start'"
                   class="chat-message-row"
                 >
-                  <tiny-col :span="1" :no="1" class="chat-avatar-wrap">
+                  <tiny-col
+                    :span="1"
+                    :no="1"
+                    class="chat-avatar-wrap"
+                    :class="{ 'chat-avatar-wrap-ai': item.role !== 'user' }"
+                  >
                     <svg-icon v-if="item.role !== 'user'" class="chat-avatar chat-avatar-ai" name="AI"></svg-icon>
                     <svg-icon v-else class="chat-avatar" name="user-head"></svg-icon>
                   </tiny-col>
@@ -63,7 +74,6 @@
                     <div
                       :class="[
                         'chat-content',
-                        chatWindowOpened ? '' : 'hidden-text',
                         item.role === 'user'
                           ? 'chat-content-user'
                           : connectedFailed
@@ -88,9 +98,7 @@
                   <svg-icon name="chat-send" class="common-svg" @click="sendContent(inputContent, false)"></svg-icon>
                 </template>
               </tiny-input>
-              <tiny-button @click="endContent"
-                ><icon-plus class="icon-plus"></icon-plus><span>新对话</span></tiny-button
-              >
+              <tiny-button @click="endContent"><svg-icon name="add"></svg-icon><span>新对话</span></tiny-button>
             </footer>
           </div>
         </div>
@@ -114,7 +122,7 @@ import {
   DropdownItem as TinyDropdownItem
 } from '@opentiny/vue'
 import { useCanvas, useHistory, usePage, useModal, getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
-import { iconChevronDown, iconPlus } from '@opentiny/vue-icon'
+import { iconChevronDown } from '@opentiny/vue-icon'
 import { extend } from '@opentiny/vue-renderless/common/object'
 import { getBlockContent, initBlockList, AIModelOptions } from './js/robotSetting'
 
@@ -128,8 +136,7 @@ export default {
     TinyDropdown,
     TinyDropdownMenu,
     TinyDropdownItem,
-    IconChevronDown: iconChevronDown(),
-    IconPlus: iconPlus()
+    IconChevronDown: iconChevronDown()
   },
   emits: ['close-chat'],
   setup() {
@@ -255,7 +262,7 @@ export default {
     }
 
     const resetContent = async () => {
-      activeMessages.value = chatWindowOpened.value ? messages.value : [messages.value[messages.value.length - 1]]
+      activeMessages.value = messages.value
       await scrollContent()
     }
 
@@ -400,7 +407,7 @@ export default {
 
 .robot-dialog {
   position: fixed;
-  width: 600px;
+  width: 450px;
   z-index: 5;
   right: 40px;
   bottom: 40px;
@@ -410,7 +417,7 @@ export default {
     var(--ti-lowcode-chat-bg-bottom-color)
   );
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.15);
-  padding: 16px 16px 30px 16px;
+  padding: 16px;
   border-radius: 12px;
 }
 .common-svg {
@@ -418,17 +425,20 @@ export default {
 }
 
 .chat-title-icons {
-  font-size: 16px;
-  height: 16px;
+  font-size: 20px;
+  height: 20px;
   margin-bottom: 20px;
   svg {
     float: right;
-    margin: 0 4px;
+    margin: 0 6px;
     cursor: pointer;
-    color: var(--ti-lowcode-chat-model-text);
+    color: var(--te-common-icon-primary);
     &:hover {
       opacity: 0.8;
     }
+    &:first-child {
+      margin-right: 0;
+    }
   }
 }
 .chat-title {
@@ -449,6 +459,7 @@ export default {
     font-size: 16px;
   }
   .ml8 {
+    color: var(--te-common-icon-secondary);
     margin-left: 10px;
   }
 }
@@ -494,7 +505,6 @@ export default {
   }
 }
 .chat-window {
-  max-height: 400px;
   overflow: scroll;
   .chat-avatar-wrap {
     width: 40px;
@@ -508,14 +518,16 @@ export default {
       border: none;
     }
   }
+  .chat-avatar-wrap-ai {
+    padding-left: 0;
+  }
   .chat-content {
-    max-width: 568px;
+    max-width: 465px;
     border-radius: 8px;
     font-size: 12px;
     font-weight: normal;
-    line-height: 36px;
-    height: 36px;
-    padding: 0 12px;
+    line-height: 20px;
+    padding: 12px;
 
     &.chat-content-user {
       background-color: var(--ti-lowcode-chat-model-user-text-bg);
@@ -525,6 +537,12 @@ export default {
   .chat-message-row {
     margin-bottom: 20px;
   }
+  &.max-chat-window {
+    height: 520px;
+  }
+  &.min-chat-window {
+    height: 80px;
+  }
 }
 
 .chat-content-ai {
@@ -550,6 +568,7 @@ export default {
       height: 40px;
       border: 2px solid var(--ti-lowcode-chat-model-input-border);
       border-radius: 8px;
+      padding-right: 44px;
     }
     .tiny-input__inner:hover {
       border-color: var(--ti-lowcode-chat-model-input-border);
@@ -557,13 +576,17 @@ export default {
     .tiny-input__inner:focus {
       border-color: var(--ti-lowcode-chat-model-input-border);
     }
+    .tiny-input__prefix,
+    .tiny-input__suffix {
+      padding-right: 8px;
+    }
     clip-path: inset(0 0 round 2px);
     svg {
       font-size: 16px;
     }
   }
 
-  .tiny-button {
+  .tiny-button.tiny-button.tiny-button {
     margin-left: 12px;
     background-image: linear-gradient(
       to bottom right,
@@ -581,8 +604,9 @@ export default {
     float: right;
     padding: 0;
     transition: all 0.1s linear;
-    .icon-plus {
-      stroke: var(--ti-lowcode-chat-model-button-text);
+    .svg-icon {
+      color: var(--ti-lowcode-chat-model-button-text);
+      margin-right: 0;
     }
     span {
       display: none;
@@ -590,7 +614,7 @@ export default {
     &:hover {
       transform: scale(1);
       border-radius: 8px;
-      width: 100px;
+      width: 105px;
       padding: 0 12px;
       span {
         display: inline-block;
@@ -611,18 +635,20 @@ export default {
 .chat-loading .tiny-loading__spinner .tiny-loading__text {
   color: var(--ti-lowcode-chat-loading-text-color);
 }
-.chat-model-popover {
-  background-color: var(--ti-lowcode-chat-model-popover-bg);
+.chat-model-popover.chat-model-popover {
+  width: 220px;
+  background-color: var(--te-common-bg-default);
   .tiny-dropdown-item {
-    color: var(--ti-lowcode-chat-model-popover-color);
+    color: var(--te-common-text-primary);
+    max-width: 220px;
     &:hover {
-      color: var(--ti-lowcode-chat-model-popover-active-color);
-      background-color: var(--ti-lowcode-chat-model-popover-active-bg);
+      color: var(--te-common-text-primary);
+      background-color: var(--te-common-bg-container);
     }
   }
   .selected-model {
-    color: var(--ti-lowcode-chat-model-popover-active-color);
-    background-color: var(--ti-lowcode-chat-model-popover-active-bg);
+    color: var(--te-common-text-primary);
+    background-color: var(--te-common-bg-container);
   }
 }
 </style>
diff --git a/packages/plugins/robot/src/js/robotSetting.js b/packages/plugins/robot/src/js/robotSetting.js
index d3ff7455d..c4bee9ca2 100644
--- a/packages/plugins/robot/src/js/robotSetting.js
+++ b/packages/plugins/robot/src/js/robotSetting.js
@@ -15,7 +15,7 @@ import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 export const AIModelOptions = [
   { label: 'ChatGPT：gpt-3.5-turbo', value: 'gpt-3.5-turbo', manufacturer: 'openai' },
-  { label: '文心一言：ERNIE-Bot-turbo', value: 'ERNIE-Bot-turbo', manufacturer: 'baiduai' }
+  { label: '文心一言：ERNIE-4.0-8k', value: 'ERNIE-4.0-8k', manufacturer: 'baiduai' }
 ]
 
 // 这里存放的是aichat的响应式数据
diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
index d9cde77e1..0bcceb461 100644
--- a/packages/plugins/schema/src/Main.vue
+++ b/packages/plugins/schema/src/Main.vue
@@ -196,8 +196,6 @@ export default {
     .icon-wrap {
       position: relative;
       .tiny-button {
-        width: 40px;
-        padding: 0;
         min-width: 40px;
         margin-right: 2px;
         height: 24px;
diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
index 12c835648..2de38900a 100644
--- a/packages/plugins/script/src/Main.vue
+++ b/packages/plugins/script/src/Main.vue
@@ -142,10 +142,8 @@ export default {
       align-items: center;
 
       .save-btn {
-        width: 40px;
-        padding: 0;
         min-width: 40px;
-        margin-right: 12px;
+        margin-right: 8px;
         height: 24px;
         line-height: 24px;
         .dots {
@@ -158,9 +156,6 @@ export default {
           right: 34px;
         }
       }
-      .icon-wrap {
-        width: auto;
-      }
     }
   }
 
diff --git a/packages/plugins/state/src/CreateStore.vue b/packages/plugins/state/src/CreateStore.vue
index 925d023d6..8b20cecf8 100644
--- a/packages/plugins/state/src/CreateStore.vue
+++ b/packages/plugins/state/src/CreateStore.vue
@@ -1,6 +1,6 @@
 <template>
   <tiny-form
-    ref="storeData"
+    ref="storeDataForm"
     class="store-form"
     :model="storeData"
     label-position="top"
@@ -138,7 +138,7 @@ export default {
       let errorMessage = ''
       let isSameState = Object.keys(props.dataSource).includes(name)
       if (!name) {
-        errorMessage = 'store 属性名称未定义'
+        errorMessage = '输入内容不能为空'
       }
 
       if (!verifyJsVarName(name)) {
@@ -224,6 +224,20 @@ export default {
       emit('close')
     }
 
+    const storeDataForm = ref(null)
+
+    const validateForm = () => {
+      return new Promise((resolve, reject) => {
+        storeDataForm.value.validate((valid) => {
+          if (valid) {
+            resolve()
+          } else {
+            reject(new Error('校验失败'))
+          }
+        })
+      })
+    }
+
     return {
       STATE,
       GETTERS,
@@ -242,7 +256,9 @@ export default {
       editorDidMount,
       variableEditor,
       actions,
-      cancel
+      cancel,
+      validateForm,
+      storeDataForm
     }
   }
 }
diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue
index eb8693d68..a2bb6d3f4 100644
--- a/packages/plugins/state/src/CreateVariable.vue
+++ b/packages/plugins/state/src/CreateVariable.vue
@@ -1,6 +1,6 @@
 <template>
   <tiny-form
-    ref="createData"
+    ref="createDataForm"
     label-position="top"
     class="create-form"
     :model="state.createData"
@@ -278,7 +278,7 @@ export default {
       state.errorMessage = ''
 
       if (!name) {
-        state.errorMessage = 'state 属性名称未定义'
+        state.errorMessage = '输入内容不能为空'
       } else if (!verifyJsVarName(name)) {
         state.errorMessage = ' state 属性名称只能以字母或下划线开头且仅包含数字字母及下划线'
       } else if (
@@ -365,6 +365,20 @@ export default {
       emit('close')
     }
 
+    const createDataForm = ref(null)
+
+    const validateForm = () => {
+      return new Promise((resolve, reject) => {
+        createDataForm.value.validate((valid) => {
+          if (valid) {
+            resolve()
+          } else {
+            reject(new Error('校验失败'))
+          }
+        })
+      })
+    }
+
     const options = {
       lineNumbers: true,
       language: 'javascript',
@@ -398,7 +412,9 @@ export default {
       validate,
       getFormData,
       insertContent,
-      cancel
+      cancel,
+      validateForm,
+      createDataForm
     }
   }
 }
diff --git a/packages/plugins/state/src/DataSourceList.vue b/packages/plugins/state/src/DataSourceList.vue
index ba4b21a5d..7ddf7dc57 100644
--- a/packages/plugins/state/src/DataSourceList.vue
+++ b/packages/plugins/state/src/DataSourceList.vue
@@ -4,7 +4,7 @@
       <li v-for="key in filteredKey" :key="key" :class="['data-source-list-item', { selected: key === selectedKey }]">
         <div class="item-head">
           <div class="item-head-left">
-            <svg-button name="plugin-icon-var"></svg-button>
+            <svg-icon name="plugin-icon-var" class="item-head-left-icon"></svg-icon>
             <span class="protocal"> {{ stateScope === STATE.CURRENT_STATE ? 'state.' : 'stores.' }}</span>
             <span class="name">{{ key }}</span>
           </div>
@@ -130,19 +130,6 @@ export default {
         display: flex;
         justify-content: flex-end;
         width: 30%;
-        .svg-button {
-          color: var(--ti-lowcode-toolbar-breadcrumb-color);
-          font-size: 14px;
-          cursor: pointer;
-
-          &:not(:last-child) {
-            margin-right: 4px;
-          }
-
-          &:hover {
-            color: var(--ti-lowcode-toolbar-icon-color);
-          }
-        }
       }
     }
   }
@@ -187,6 +174,10 @@ export default {
         overflow: hidden;
         text-overflow: ellipsis;
       }
+      .item-head-left-icon {
+        color: var(--te-common-icon-secondary);
+        margin-right: 8px;
+      }
     }
 
     .item-head-right {
diff --git a/packages/plugins/state/src/EditorI18nTool.vue b/packages/plugins/state/src/EditorI18nTool.vue
index 757f3ac97..296f0e226 100644
--- a/packages/plugins/state/src/EditorI18nTool.vue
+++ b/packages/plugins/state/src/EditorI18nTool.vue
@@ -8,7 +8,10 @@
     @hide="onClosePopover"
   >
     <div class="popover-content">
-      <icon-close class="icon-close" @click="state.showPopover = false"></icon-close>
+      <div class="content-header">
+        <span class="content-header-title">国际化管理</span>
+        <icon-close class="icon-close" @click="state.showPopover = false"></icon-close>
+      </div>
       <bind-i18n
         ref="bindI18nRef"
         v-model="i18nValue"
@@ -21,7 +24,7 @@
         <template #suffix>
           <div class="buttons">
             <tiny-button @click="createI18n">新建词条</tiny-button>
-            <tiny-button type="info" :disabled="!i18nData" @click="handleConfirm">插入词条</tiny-button>
+            <tiny-button type="primary" :disabled="!i18nData" @click="handleConfirm">插入词条</tiny-button>
           </div>
         </template>
       </bind-i18n>
@@ -126,13 +129,28 @@ export default {
 
 <style lang="less" scoped>
 .popover-content {
+  padding: 8px 4px;
   text-align: right;
   .icon-close {
-    margin-right: 5px;
+    font-size: 16px;
     cursor: pointer;
   }
   .buttons {
-    margin-top: 10px;
+    margin-top: 16px;
+  }
+  .content-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .content-header-title {
+      font-size: var(--te-base-font-size-1);
+      font-weight: var(--te-base-font-weight-7);
+    }
+    margin-bottom: 16px;
+  }
+  .tiny-button.tiny-button.tiny-button.tiny-button--default {
+    margin-right: 4px;
+    border-color: var(--te-common-border-secondary);
   }
 }
 .buttons {
diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
index 94cd4ed34..b3aa9db5a 100644
--- a/packages/plugins/state/src/Main.vue
+++ b/packages/plugins/state/src/Main.vue
@@ -193,61 +193,54 @@ export default {
       const { name } = state.createData
       const { getSchema, updateSchema } = useCanvas()
 
-      if (!name || errorMessage.value) {
-        notifySaveError('变量名未填写或名称不符合规范，请按照提示修改后重试。')
-        return
-      }
-
       if (activeName.value === STATE.CURRENT_STATE) {
         // 校验
-        const validateResult = variableRef.value.validate()
-        if (!validateResult.success) {
-          notifySaveError(validateResult.message)
-          return
-        }
-
-        // 获取数据
-        let variable = variableRef.value.getFormData()
+        variableRef.value.validateForm().then(() => {
+          // 获取数据
+          let variable = variableRef.value.getFormData()
 
-        // 保存数据
-        add(name, variable)
-        isPanelShow.value = false
-        setSaved(false)
+          // 保存数据
+          add(name, variable)
+          isPanelShow.value = false
+          setSaved(false)
 
-        const schema = getSchema()
-        updateSchema({ state: { ...(schema.state || {}), [name]: variable } })
+          const schema = getSchema()
+          updateSchema({ state: { ...(schema.state || {}), [name]: variable } })
 
-        useHistory().addHistory()
+          useHistory().addHistory()
+        })
       } else {
-        const validateResult = validateMonacoEditorData(storeRef.value.getEditor(), 'state字段', { required: true })
-        if (!validateResult.success) {
-          notifySaveError(validateResult.message)
-          return
-        }
+        storeRef.value.validateForm().then(() => {
+          const validateResult = validateMonacoEditorData(storeRef.value.getEditor(), 'state字段', { required: true })
+          if (!validateResult.success) {
+            notifySaveError(validateResult.message)
+            return
+          }
 
-        const storeState = storeRef.value.getEditor().getValue()
-        const getters = storeRef.value.saveMethods('gettersEditor')
-        const actions = storeRef.value.saveMethods('actionsEditor')
-        const store = {
-          [name]: {
-            id: name,
-            state: storeState,
-            getters,
-            actions
+          const storeState = storeRef.value.getEditor().getValue()
+          const getters = storeRef.value.saveMethods('gettersEditor')
+          const actions = storeRef.value.saveMethods('actionsEditor')
+          const store = {
+            [name]: {
+              id: name,
+              state: storeState,
+              getters,
+              actions
+            }
           }
-        }
 
-        if (updateKey.value !== name && flag.value === OPTION_TYPE.UPDATE) {
-          delete state.dataSource[updateKey.value]
-        }
+          if (updateKey.value !== name && flag.value === OPTION_TYPE.UPDATE) {
+            delete state.dataSource[updateKey.value]
+          }
 
-        Object.assign(state.dataSource, store)
-        const storeList = Object.values(state.dataSource)
+          Object.assign(state.dataSource, store)
+          const storeList = Object.values(state.dataSource)
 
-        const { id } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo()
-        updateGlobalState(id, { global_state: storeList }).then((res) => {
-          isPanelShow.value = false
-          useResource().appSchemaState.globalState = res.global_state || []
+          const { id } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo()
+          updateGlobalState(id, { global_state: storeList }).then((res) => {
+            isPanelShow.value = false
+            useResource().appSchemaState.globalState = res.global_state || []
+          })
         })
       }
       openCommon()
@@ -472,7 +465,7 @@ export default {
       border-bottom: 1px solid var(--ti-lowcode-data-header-border-bottom-color);
       .options-wrap {
         display: flex;
-        column-gap: 16px;
+        column-gap: 8px;
         align-items: center;
         :deep(button.tiny-button.tiny-button--primary) {
           display: flex;
@@ -480,7 +473,6 @@ export default {
           min-width: 40px;
           justify-content: center;
           height: 24px;
-          padding: 0;
           border-radius: 4px;
         }
       }
diff --git a/packages/settings/events/src/components/AddEventsDialog.vue b/packages/settings/events/src/components/AddEventsDialog.vue
index ccfcdc16d..8926d282b 100644
--- a/packages/settings/events/src/components/AddEventsDialog.vue
+++ b/packages/settings/events/src/components/AddEventsDialog.vue
@@ -11,7 +11,7 @@
       ref="ruleForm"
       :model="formData"
       :rules="rules"
-      label-width="100px"
+      label-width="80px"
       :inline-message="true"
       validate-type="text"
       label-position="left"
@@ -117,7 +117,7 @@ const addMethod = () => {
 </script>
 
 <style lang="less" scoped>
-.add-custom-event-form {
+.add-custom-event-form.add-custom-event-form {
   :deep(.tiny-form-item__label) {
     padding-left: 0;
   }
diff --git a/packages/settings/events/src/components/AdvanceConfig.vue b/packages/settings/events/src/components/AdvanceConfig.vue
index 889c370d1..550909bdc 100644
--- a/packages/settings/events/src/components/AdvanceConfig.vue
+++ b/packages/settings/events/src/components/AdvanceConfig.vue
@@ -16,7 +16,7 @@
       </div>
     </div>
 
-    <div class="advnce-config">
+    <div class="advnce-config loop-data-item">
       <label class="text-ellipsis-multiple">循环数据</label>
       <div class="advanced-config-form-item">
         <code-configurator
@@ -300,5 +300,11 @@ export default {
       }
     }
   }
+  .loop-data-item {
+    display: block;
+    label {
+      margin-bottom: 5px;
+    }
+  }
 }
 </style>
diff --git a/packages/settings/events/src/components/BindEvents.vue b/packages/settings/events/src/components/BindEvents.vue
index 181d9fddc..335c046aa 100644
--- a/packages/settings/events/src/components/BindEvents.vue
+++ b/packages/settings/events/src/components/BindEvents.vue
@@ -358,7 +358,6 @@ export default {
   }
 }
 .bind-event-list {
-  padding: var(--te-common-vertical-item-spacing-normal) 0;
   color: var(--ti-lowcode-events-bind-event-list-color);
 }
 .bind-event-list-item-notallow {
@@ -367,7 +366,8 @@ export default {
   color: var(--ti-lowcode-events-bind-event-list-item-disabled-color);
 }
 .bind-event-list-item {
-  padding: 0 12px;
+  padding: 0 16px;
+  margin: 0 -16px;
   line-height: 24px;
   &:hover {
     cursor: pointer;
diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue
index c1f1bb69a..eae222ed8 100644
--- a/packages/settings/styles/src/Main.vue
+++ b/packages/settings/styles/src/Main.vue
@@ -200,7 +200,7 @@ export default {
       () => isCollapsed.value,
       () => {
         if (isCollapsed.value) {
-          activeNames.value = [styleCategoryGroup[0]]
+          activeNames.value = []
         } else {
           activeNames.value = styleCategoryGroup
         }
diff --git a/packages/settings/styles/src/components/background/BackgroundGroup.vue b/packages/settings/styles/src/components/background/BackgroundGroup.vue
index 63b148e44..ca25c1371 100644
--- a/packages/settings/styles/src/components/background/BackgroundGroup.vue
+++ b/packages/settings/styles/src/components/background/BackgroundGroup.vue
@@ -285,14 +285,16 @@ export default {
     const openBackgroundImageModal = (event, { isAdd, index }) => {
       if (isAdd) {
         const styleObj = {
-          [BACKGROUND_PROPERTY.BackgroundImage]: 'url(img/bgcModal.png)',
-          [BACKGROUND_PROPERTY.BackgroundPosition]: '0px 0px',
-          [BACKGROUND_PROPERTY.BackgroundSize]: 'auto'
+          [BACKGROUND_PROPERTY.BackgroundImage]: 'linear-gradient(#000, #000)',
+          [BACKGROUND_PROPERTY.BackgroundPosition]: null,
+          [BACKGROUND_PROPERTY.BackgroundSize]: null,
+          [BACKGROUND_PROPERTY.BackgroundRepeat]: null,
+          [BACKGROUND_PROPERTY.BackgroundAttachment]: null
         }
 
         state.backgroundImageList.unshift({
-          type: 'ImageSetting',
-          text: 'background-image.svg',
+          type: 'ColorOverlay',
+          text: '#000',
           styleObj
         })
       }
diff --git a/packages/settings/styles/src/components/background/BackgroundImageSetting.vue b/packages/settings/styles/src/components/background/BackgroundImageSetting.vue
index 769aebffa..d34a2fd68 100644
--- a/packages/settings/styles/src/components/background/BackgroundImageSetting.vue
+++ b/packages/settings/styles/src/components/background/BackgroundImageSetting.vue
@@ -69,16 +69,14 @@ export default {
   setup(props, { emit }) {
     const state = reactive({
       style: {},
-      styleComponent: 'ImageSetting',
+      styleComponent: 'ColorOverlay',
       typeLists: [
         {
-          content: '背景图',
-          icon: 'background-image',
+          content: '颜色叠加',
+          icon: 'background-color',
           value: {
-            styleComponent: 'ImageSetting',
-            imageUrl: 'img/bgcModal.png',
-            position: '0px 0px',
-            size: 'auto'
+            styleComponent: 'ColorOverlay',
+            imageUrl: 'linear-gradient(#000, #000)'
           }
         },
         {
@@ -98,11 +96,13 @@ export default {
           }
         },
         {
-          content: '颜色叠加',
-          icon: 'background-color',
+          content: '背景图',
+          icon: 'image',
           value: {
-            styleComponent: 'ColorOverlay',
-            imageUrl: 'linear-gradient(#000, #000)'
+            styleComponent: 'ImageSetting',
+            imageUrl: 'img/bgcModal.png',
+            position: '0px 0px',
+            size: 'auto'
           }
         }
       ]
diff --git a/packages/settings/styles/src/components/background/ImageSetting.vue b/packages/settings/styles/src/components/background/ImageSetting.vue
index 76a8e2291..c089003ca 100644
--- a/packages/settings/styles/src/components/background/ImageSetting.vue
+++ b/packages/settings/styles/src/components/background/ImageSetting.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="background-row line">
-    <label class="image-label top">背景图</label>
-    <div class="image-content">
+    <label class="image-label">背景图</label>
+    <!-- <div class="image-content">
       <div class="image-wrap">
         <div class="image-inner"></div>
       </div>
@@ -15,7 +15,8 @@
       <div class="choose-image">
         <span>选择图片</span>
       </div>
-    </div>
+    </div> -->
+    <tiny-input v-model="state.imgUrl" placeholder="请输入图片URL" @change="handleChangeImg"></tiny-input>
   </div>
   <div class="background-row line">
     <label class="size-label">大小</label>
@@ -73,7 +74,8 @@
 
 <script setup>
 import { reactive, defineProps, defineEmits, onMounted } from 'vue'
-import { Checkbox as TinyCheckbox } from '@opentiny/vue'
+// import { Checkbox as TinyCheckbox } from '@opentiny/vue'
+import { Input as TinyInput } from '@opentiny/vue'
 import { TabsGroupConfigurator } from '@opentiny/tiny-engine-configurator'
 import PositionOrigin from './PositionOrigin.vue'
 import InputSelect from '../inputs/InputSelect.vue'
@@ -104,6 +106,7 @@ const emit = defineEmits(['updateStyle'])
 
 const state = reactive({
   checked: false,
+  imgUrl: '',
   sizeSelected: 'custom',
   repeat: 'no-repeat',
   fixedSelected: 'scroll',
@@ -117,16 +120,21 @@ const updateStyle = (property) => {
   emit('updateStyle', property)
 }
 
-const imageSizeChange = (val) => {
-  state.width = val ? '125' : 'Auto'
-  state.widthSuffix = val ? 'px' : 'auto'
-  state.height = 'Auto'
-  state.heightSuffix = 'auto'
-  val
-    ? updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: '125px' })
-    : updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: null })
+const handleChangeImg = (value) => {
+  state.imgUrl = value
+  updateStyle({ [BACKGROUND_PROPERTY.BackgroundImage]: `url(${value})` })
 }
 
+// const imageSizeChange = (val) => {
+//   state.width = val ? '125' : 'Auto'
+//   state.widthSuffix = val ? 'px' : 'auto'
+//   state.height = 'Auto'
+//   state.heightSuffix = 'auto'
+//   val
+//     ? updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: '125px' })
+//     : updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: null })
+// }
+
 const selectSize = (value) => {
   if (value !== 'auto') {
     state.width = 'Auto'
@@ -199,6 +207,8 @@ const selectFixed = (value) => {
 
 onMounted(() => {
   const { styleObj } = props.style
+  const backgroundImageStr = styleObj[BACKGROUND_PROPERTY.BackgroundImage]
+  state.imgUrl = backgroundImageStr ? backgroundImageStr.substring(4, backgroundImageStr.length - 1) : ''
   state.fixedSelected = styleObj[BACKGROUND_PROPERTY.BackgroundAttachment]
   state.repeat = styleObj[BACKGROUND_PROPERTY.BackgroundRepeat]
   const sizeKeyword = ['cover', 'contain']
diff --git a/packages/settings/styles/src/components/classNamesContainer/index.vue b/packages/settings/styles/src/components/classNamesContainer/index.vue
index 66c5fac20..2bea00277 100644
--- a/packages/settings/styles/src/components/classNamesContainer/index.vue
+++ b/packages/settings/styles/src/components/classNamesContainer/index.vue
@@ -521,6 +521,7 @@ const handleDeleteCurSelector = () => {
     padding: 3px;
     border: 1px solid var(--ti-lowcode-className-selector-container-border-color);
     border-radius: var(--te-base-border-radius-1);
+    color: var(--te-common-text-weaken);
     cursor: pointer;
   }
 
diff --git a/packages/settings/styles/src/components/effects/EffectGroup.vue b/packages/settings/styles/src/components/effects/EffectGroup.vue
index 0f878d105..59c329ecc 100644
--- a/packages/settings/styles/src/components/effects/EffectGroup.vue
+++ b/packages/settings/styles/src/components/effects/EffectGroup.vue
@@ -11,7 +11,6 @@
         :modelValue="state.opacity"
         :controls="false"
         :showUnit="true"
-        :disabled="true"
         @update:modelValue="updateOpacity"
       ></slider-configurator>
     </div>
diff --git a/packages/settings/styles/src/components/inputs/ModalMask.vue b/packages/settings/styles/src/components/inputs/ModalMask.vue
index dd2cd466a..6d221e565 100644
--- a/packages/settings/styles/src/components/inputs/ModalMask.vue
+++ b/packages/settings/styles/src/components/inputs/ModalMask.vue
@@ -54,8 +54,13 @@ export default {
     const modalContent = ref(null)
 
     const calculateTopStyle = (modalContent) => {
+      const innnerHeight = window.getComputedStyle(document.body).height
       if (isAlignBody && modalContent) {
-        return modal.top < modalContent.offsetHeight ? 40 : modal.top - modalContent.offsetHeight + 40
+        return modal.top < modalContent.offsetHeight
+          ? 40
+          : modal.top > parseInt(innnerHeight) - 400
+          ? modal.top - 364
+          : modal.top - modalContent.offsetHeight + 40
       }
       return modal.top - 34
     }
diff --git a/packages/settings/styles/src/components/typography/TypographyGroup.vue b/packages/settings/styles/src/components/typography/TypographyGroup.vue
index e5f2df84f..3a7373bee 100644
--- a/packages/settings/styles/src/components/typography/TypographyGroup.vue
+++ b/packages/settings/styles/src/components/typography/TypographyGroup.vue
@@ -55,7 +55,7 @@
             filterable
             default-first-option
           ></select-configurator>
-          PX
+          px
         </div>
       </div>
 
diff --git a/packages/theme/base/src/base.less b/packages/theme/base/src/base.less
index bddb55615..3e4c6cf8e 100644
--- a/packages/theme/base/src/base.less
+++ b/packages/theme/base/src/base.less
@@ -39,6 +39,7 @@
   --te-base-red-120: #d4827f;
   --te-base-red-130: #f2c5c2;
   --te-base-red-140: rgba(242, 48, 48, 0.3);
+  --te-base-red-150: #330002;
 
   // expand-orange
   --te-base-orange-10: #fff5e8;
diff --git a/packages/theme/base/src/common.less b/packages/theme/base/src/common.less
index 43e152617..fdc4bdd18 100644
--- a/packages/theme/base/src/common.less
+++ b/packages/theme/base/src/common.less
@@ -19,6 +19,7 @@
   --te-common-text-checked: var(--te-base-blue-60); // 选中或者hover文字 #1476ff
 
   --te-common-icon-primary: var(--te-base-gray-90); // 重要图标色 #191919
+  --te-common-icon-hover: var(--te-base-gray-70); // 图标悬浮色 #595959
   --te-common-icon-secondary: var(--te-base-gray-60); // 图标默认色 #808080
   --te-common-icon-disabled: var(--te-base-gray-50); // 图标禁用色 #c2c2c2
   --te-common-icon-link: var(--te-base-blue-60); // 图标提示色 #1476ff
@@ -32,6 +33,7 @@
   --te-common-border-divider: var(--te-base-gray-30); //线条-白色背景分割线颜色 #e6e6e6
   --te-common-border-bg-divider: var(--te-base-gray-40); // 线条-灰色背景分割线颜色/表头分割线/选块分割线 #dbdbdb
   --te-common-border-checked: var(--te-base-blue-60); // 线条 选中色 #1476ff
+  --te-common-border-error-hover: var(--te-base-red-30); // 线条 红色按钮边框hover色 #faa7a3
 
   --te-common-bg-primary: var(--te-base-gray-90); // 主要按钮-背景色 #191919
   --te-common-bg-primary-checked: var(--te-base-blue-60); // 主色-背景色  选中和hover等颜色 #1476ff
@@ -47,9 +49,10 @@
   --te-common-bg-default: var(--te-base-gray-0); // 白色背景-输入框背景/面板背景色 #fff
   --te-common-bg-disabled: var(--te-base-gray-20); // 禁用/标签/下拉框多选标签 背景色 #f0f0f0
   --te-common-bg-switch: var(--te-base-gray-50); // 开关默认色 #c2c2c2
-  --te-common-bg-error: var(--te-base-red-20); // 浅色错误背景-背景色 #fce2e0
+  --te-common-bg-error: var(--te-base-red-10); // 浅色错误背景-背景色 #fff1f0
   --te-common-bg-popover: var(--te-base-gray-0); // 对话框/tooltip/popover背景 #fff
   --te-common-bg-text-emphasize: var(--te-base-blue-140); // 强调性文字背景色 rgba(20, 118, 255, 0.1)
+  --te-common-bg-info: var(--te-base-blue-20); // 提示框info背景色 #e7f1ff
 
   // 通用间距
   --te-common-vertical-item-spacing-normal: 12px; // 表单元素之间的距离，标题和列表之间的距离、一个独立元素的padding等等
@@ -75,6 +78,7 @@
   --te-common-text-checked: var(--te-base-blue-60); // 选中或者hover文字 #1476ff
 
   --te-common-icon-primary: var(--te-base-gray-20); // 重要图标色 #F0F0F0
+  --te-common-icon-hover: var(--te-base-gray-110); //  图标悬浮色 #B4B5B8
   --te-common-icon-secondary: var(--te-base-gray-120); // 图标默认色 #8B8C8F
   --te-common-icon-disabled: var(--te-base-gray-50); // 图标禁用色 #C2C2C2
   --te-common-icon-link: var(--te-base-blue-60); // 图标提示色 #1476ff
@@ -88,6 +92,7 @@
   --te-common-border-divider: var(--te-base-gray-140); //线条-白色背景分割线颜色 #36383D
   --te-common-border-bg-divider: var(--te-base-gray-130); // 线条-灰色背景分割线颜色/表头分割线/选块分割线 #4D4E52
   --te-common-border-checked: var(--te-base-blue-60); // 线条 选中色 #1476ff
+  --te-common-border-error-hover: var(--te-base-red-90); // 线条 红色按钮边框hover色 #78080e
 
   --te-common-bg-primary: var(--te-base-gray-20); // 主要按钮-背景色 #F0F0F0
   --te-common-bg-primary-checked: var(--te-base-blue-60); // 主色-背景色 选中和hover等颜色 #1476ff
@@ -102,8 +107,9 @@
   --te-common-bg-default: var(--te-base-gray-160); // 深色背景-输入框背景/面板背景色 #212329
   --te-common-bg-disabled: var(--te-base-gray-150); // 禁用/标签/下拉框多选标签 背景色 #2a2c31
   --te-common-bg-switch: var(--te-base-gray-130); // 开关默认色 #4D4E52
-  --te-common-bg-error: var(--te-base-red-20); // 浅色错误背景-背景色 #fce2e0
+  --te-common-bg-error: var(--te-base-red-150); // 深色错误背景-背景色 #330002
   --te-common-bg-popover: var(--te-base-gray-170); // 对话框/tooltip/popover背景 #0F1115
+  --te-common-bg-info: var(--te-base-blue-110); // 提示框info背景色 #202b3f
 
   // 通用间距
   --te-common-vertical-item-spacing-normal: 12px; // 表单元素之间的距离，标题和列表之间的距离、一个独立元素的padding等等
diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
index 81d629128..e86f760d4 100644
--- a/packages/theme/base/src/component-common.less
+++ b/packages/theme/base/src/component-common.less
@@ -47,6 +47,9 @@
       font-size: var(--te-base-font-size-base);
     }
   }
+  .tiny-select-dropdown__empty {
+    font-size: var(--te-base-font-size-base);
+  }
   // 下拉选项框
   .tiny-select-dropdown__item {
     padding: 0px 12px;
@@ -109,6 +112,10 @@
     color: var(--te-common-text-disabled);
     font-size: var(--te-base-font-size-base);
   }
+  input::-webkit-input-placeholder {
+    color: var(--te-common-text-weaken);
+    font-size: var(--te-base-font-size-base);
+  }
 }
 
 // 3、折叠框
@@ -126,7 +133,7 @@
     border-bottom-style: none;
 
     .tiny-collapse-item__word-overflow {
-      margin: var(--te-common-vertical-item-spacing-normal) 0px var(--te-common-vertical-form-label-spacing);
+      margin: var(--te-common-vertical-item-spacing-normal) 0px;
       width: 100%;
       line-height: var(--te-base-line-height-4);
     }
@@ -309,10 +316,20 @@
     }
     .tiny-button--danger {
       margin-right: 8px;
+      border-color: var(--te-common-color-error);
+      color: var(--te-common-color-error);
+      background-color: transparent;
+      &:hover {
+        border-color: var(--te-common-border-error-hover);
+        background-color: transparent;
+      }
     }
     .tiny-button--primary,
     .tiny-button--info {
-      margin-left: 8px;
+      margin-left: 4px;
+    }
+    .tiny-button--default.tiny-button--default {
+      border-color: var(--te-common-border-secondary);
     }
   }
 }
@@ -343,7 +360,7 @@
     background-color: var(--te-common-bg-primary);
     color: var(--te-common-text-inverse);
     border: 1px solid var(--te-common-border-active);
-    &:hover {
+    &:not(.is-disabled):hover {
       border: 1px solid var(--te-common-border-hover);
       background-color: var(--te-common-bg-secondary);
     }
@@ -353,7 +370,7 @@
     border-color: var(--te-common-border-active);
     background-color: var(--te-common-bg-primary);
 
-    &:hover {
+    &:not(.is-disabled):hover {
       border-color: var(--te-common-border-secondary);
     }
   }
@@ -367,6 +384,7 @@
   &.is-disabled {
     background-color: var(--te-common-bg-disabled);
     color: var(--te-common-text-disabled);
+    border-color: var(--te-common-border-disabled);
     .btn-icon {
       color: var(--te-common-icon-disabled);
     }
@@ -516,6 +534,12 @@
     .tiny-numeric__increase {
       border-bottom-color: var(--te-common-border-default);
     }
+    .tiny-numeric__decrease {
+      height: calc(50% - 0.5px);
+      svg {
+        transform: scale(0.8) translateY(1px);
+      }
+    }
   }
   .tiny-numeric-base .is-disabled {
     background: var(--te-common-bg-disabled);
@@ -534,6 +558,7 @@
     border: 0;
     width: 14px;
     margin-right: 4px;
+    height: auto;
   }
 }
 
@@ -772,7 +797,7 @@
   .tiny-form-item.is-error .tiny-textarea__inner,
   .tiny-form-item.is-error .tiny-textarea__inner:focus {
     border-color: var(--te-common-color-error);
-    background-color: var(--te-base-red-10);
+    background-color: var(--te-common-bg-error);
   }
 }
 .tiny-form--label-left.label-align .tiny-form-item.is-required .tiny-form-item__label.tiny-form-item__label {
@@ -799,6 +824,19 @@
 .tiny-form-item__label.tiny-form-item__label {
   padding-right: 16px;
 }
+.tiny-form--label-left.has-required .tiny-form-item__label,
+.tiny-form--label-left.label-align .tiny-form-item.is-required .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form--label-left.label-align
+  .tiny-form-item.is-required
+  ~ .tiny-form-item
+  .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form-item__label.tiny-form-item__label {
+  padding-right: 16px;
+}
 
 // 19、表格
 .tiny-grid__wrapper.tiny-grid__wrapper.tiny-grid__wrapper {
@@ -982,3 +1020,11 @@
     }
   }
 }
+
+.tiny-alert {
+  &.tiny-alert--info {
+    background: var(--te-common-bg-info);
+    border-color: transparent;
+    color: var(--te-common-text-primary);
+  }
+}
diff --git a/packages/theme/light/metaComponent.less b/packages/theme/light/metaComponent.less
index 49cf1a5a3..9fe592bd2 100644
--- a/packages/theme/light/metaComponent.less
+++ b/packages/theme/light/metaComponent.less
@@ -10,7 +10,7 @@
   // MetaCodeEditor
   --ti-lowcode-meta-codeEditor-color: var(--ti-lowcode-base-text-color);
   --ti-lowcode-meta-codeEditor-hover-color: var(--ti-lowcode-base-text-color);
-  --ti-lowcode-meta-codeEditor-border-color: var(--ti-lowcode-base-default-button-border-color);
+  --ti-lowcode-meta-codeEditor-border-color: var(--te-common-border-default);
   --ti-lowcode-meta-codeEditor-border-hover-color: var(--ti-lowcode-base-default-button-border-hover-color);
   --ti-lowcode-meta-codeEditor-icon-color: var(--te-common-text-weaken);
 }
diff --git a/packages/toolbars/save/src/Main.vue b/packages/toolbars/save/src/Main.vue
index 24fd0963f..5f9879e2b 100644
--- a/packages/toolbars/save/src/Main.vue
+++ b/packages/toolbars/save/src/Main.vue
@@ -195,10 +195,6 @@ export default {
     &:not(.disabled):hover {
       background-color: var(--ti-lowcode-toolbar-button-bg);
     }
-
-    .save-title {
-      margin: 0 6px;
-    }
   }
 
   :deep(.icon-down-arrow:focus) {