From a970dc50e7712467ec27df338c841fc85afdb8ce Mon Sep 17 00:00:00 2001
From: zhf <1204297681@qq.com>
Date: Fri, 14 Nov 2025 19:51:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=91=88=E7=8E=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../form-item-container.scss                  | 32 +++-----
 .../form-item-container.tsx                   | 15 ++--
 src/editor/array/ibiz-array/ibiz-array.scss   |  3 +-
 .../cascader/ibiz-cascader/ibiz-cascader.scss |  2 +-
 .../ibiz-checkbox-list.scss                   |  5 +-
 .../ibiz-checkbox/ibiz-checkbox.scss          |  2 +-
 .../ibiz-color-picker/ibiz-color-picker.scss  | 17 ++--
 .../ibiz-mpicker/ibiz-mpicker.scss            |  6 +-
 .../ibiz-picker-select-view.scss              |  8 +-
 .../data-picker/ibiz-picker/ibiz-picker.scss  |  6 +-
 .../ibiz-date-picker/ibiz-date-picker.scss    |  2 +-
 .../ibiz-date-range-picker.scss               |  4 +
 .../ibiz-cascader-dropdown.scss               |  2 +-
 .../ibiz-dropdown-list.scss                   |  8 +-
 .../ibiz-dropdown/ibiz-dropdown.scss          |  5 +-
 .../ibiz-emoji-picker/ibiz-emoji-picker.scss  |  2 +-
 .../ibiz-map-picker/ibiz-map-picker.scss      |  4 +
 .../ibiz-number-range-picker.scss             |  2 +-
 .../qrcode/ibiz-qrcode/ibiz-qrcode.scss       |  5 +-
 .../ibiz-radio/ibiz-radio.scss                |  2 +-
 src/editor/rate/ibiz-rate/ibiz-rate.scss      |  2 +-
 src/editor/raw/ibiz-raw/ibiz-raw.scss         |  8 ++
 src/editor/span/span-link/span-link.scss      |  2 +-
 src/editor/span/span/span.scss                | 10 ++-
 src/editor/span/span/span.tsx                 |  5 ++
 .../stepper/ibiz-stepper/ibiz-stepper.scss    |  4 +-
 .../switch/ibiz-switch/ibiz-switch.scss       |  2 +-
 .../ibiz-input-number/ibiz-input-number.scss  |  4 +-
 src/editor/text-box/input/input.scss          |  4 +-
 .../ibiz-file-upload/ibiz-file-upload.scss    | 13 ++-
 .../ibiz-image-cropping.scss                  | 81 +++++++++++--------
 .../ibiz-image-select/ibiz-image-select.scss  |  6 +-
 .../ibiz-image-upload/ibiz-image-upload.scss  | 81 +++++++++++--------
 34 files changed, 216 insertions(+), 139 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20c173145..a68636133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -133,6 +133,7 @@
 - 优化时间范围选择、html、markdown、二维码编辑器样式，适配暗色主题
 - 调整分页导航视图与分页搜索视图的视图刷新逻辑
 - 优化树部件样式，适配暗色主题
+- 修改编辑器的呈现样式
 
 ### Fixed
 
diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
index e71bf737c..095be7d7a 100644
--- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
+++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss
@@ -12,10 +12,10 @@ $form-item-container: (
 
   // 高度
   editor-min-height: calc(
-    getCssVar(form-item, line-height) + 2 * getCssVar(spacing, tight)
+    getCssVar(editor, default, line-height) + 2 * getCssVar(spacing, extra-tight)
   ),
   border-editor-min-height: calc(
-    getCssVar(form-item, line-height) + 2 * getCssVar(spacing, tight)
+    getCssVar(editor, default, line-height) + 2 * getCssVar(spacing, extra-tight)
   ),
 
   // 间距
@@ -23,8 +23,8 @@ $form-item-container: (
   left-container-padding: getCssVar(spacing, base),
   error-margin-top: getCssVar(spacing, extra-tight),
   container-error-padding: 0 getCssVar(spacing, base),
-  editor-padding: getCssVar(spacing, tight) getCssVar(spacing, none)
-  getCssVar(spacing, tight) getCssVar(spacing, none),
+  editor-padding: getCssVar(spacing, extra-tight) getCssVar(spacing, none)
+  getCssVar(spacing, extra-tight) getCssVar(spacing, none),
   border-editor-padding: getCssVar(spacing, tight),
 
   // 圆角
@@ -34,7 +34,7 @@ $form-item-container: (
   label-font-size: getCssVar(font-size, header-6),
 
   // 行高
-  line-height: getCssVar(form-item, line-height),
+  line-height: getCssVar(editor, default, line-height),
 
   // 边框
   border: rem(1px) getCssVar(color, border) solid,
@@ -151,8 +151,8 @@ $form-item-popover: (
     width: getCssVar(form-item-container, label-width);
     overflow: visible;
     color: getCssVar(form-item-label, text-color);
-    height: getCssVar(form-item, line-height);
-    line-height: getCssVar(form-item, line-height);
+    height: getCssVar(form-item-container, line-height);
+    line-height: getCssVar(form-item-container, line-height);
 
     @include m('icon') {
       padding-right: getCssVar(form-item-label, icon-padding-right);
@@ -171,19 +171,7 @@ $form-item-popover: (
   // 编辑器
   @include e(editor) {
     width: 100%;
-    text-align: getCssVar(form-item-container, editor-align);
     min-height: getCssVar(form-item-container, editor-min-height);
-    #{--van-cell-line-height}: getCssVar(form-item, line-height);
-    #{--van-cell-line-height}: getCssVar(form-item, line-height);
-
-    .van-cell {
-      padding-bottom: 0;
-    }
-
-    ::placeholder {
-      color: getCssVar('form-item', 'placeholder-color');
-      -webkit-text-fill-color: getCssVar('form-item', 'placeholder-color');
-    }
   }
 
   // 必填图标 *
@@ -220,7 +208,7 @@ $form-item-popover: (
 @include b(form-item-container) {
   @include m(left) {
     .#{bem(form-item-container, editor)} {
-      min-height: getCssVar(form-item, line-height);
+      min-height: getCssVar(form-item-container, line-height);
     }
 
     &::after {
@@ -230,7 +218,7 @@ $form-item-popover: (
 
   @include m(right) {
     .#{bem(form-item-container, editor)} {
-      min-height: getCssVar(form-item, line-height);
+      min-height: getCssVar(form-item-container, line-height);
     }
 
     &::after {
@@ -303,5 +291,5 @@ $form-item-popover: (
   font-size: getCssVar('form-item', 'error-font-size');
   line-height: getCssVar('form-item', 'font-size');
   color: getCssVar('form-item', 'error-color');
-  text-align: getCssVar('form-item-container', 'editor-align');
+  text-align: getCssVar(editor, default, text-align);
 }
diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
index 5e1818362..dda84fd7f 100644
--- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
+++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.tsx
@@ -14,6 +14,7 @@ export const IBizFormItemContainer = defineComponent({
   },
   setup(props) {
     const ns = useNamespace('form-item-container');
+    const editorNs = useNamespace('editor');
     let labelAlign: 'right' | 'left' = 'left';
     let editorAlign: 'right' | 'left' = 'right';
     const c = props.controller;
@@ -81,17 +82,17 @@ export const IBizFormItemContainer = defineComponent({
       }
       const result: IData = {
         'label-align': labelAlign,
-        'editor-align': editorAlign,
       };
       if (labelWidth !== 130) {
         Object.assign(result, { 'label-width': `${labelWidth}px` });
       }
-      if (hideClear) {
-        Object.assign(result, { 'required-style': 'none' });
-      } else {
-        Object.assign(result, { 'required-style': 'initial' });
-      }
-      return ns.cssVarBlock(result);
+      return {
+        ...ns.cssVarBlock(result),
+        ...editorNs.cssVarBlock({
+          'default-text-align': editorAlign,
+          'default-required-style': hideClear ? 'none' : 'initial',
+        }),
+      };
     });
 
     const handleClick = (e: MouseEvent) => {
diff --git a/src/editor/array/ibiz-array/ibiz-array.scss b/src/editor/array/ibiz-array/ibiz-array.scss
index a5d1b1eeb..09b3c75d6 100644
--- a/src/editor/array/ibiz-array/ibiz-array.scss
+++ b/src/editor/array/ibiz-array/ibiz-array.scss
@@ -12,7 +12,7 @@ $array: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 高度
   min-height: getCssVar(editor, default, line-height),
@@ -74,6 +74,7 @@ $array: (
 @include b(array-icons) {
   display: flex;
   align-items: center;
+  justify-content: getCssVar(array, text-align);
   min-height: getCssVar(array, min-height);
   margin-left: getCssVar(array, spacing-icons-margin-left);
   gap: getCssVar(array, spacing-icons-gap);
diff --git a/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss b/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss
index 86d709db2..3f52fe85a 100644
--- a/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss
+++ b/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss
@@ -12,7 +12,7 @@ $cascader: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(cascader) {
diff --git a/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.scss b/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.scss
index cc540fbe7..3cdcb3c55 100644
--- a/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.scss
+++ b/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.scss
@@ -11,7 +11,7 @@ $checkbox-list: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 间距
   gap: getCssVar(spacing, tight),
@@ -21,7 +21,7 @@ $checkbox-list: (
   @include set-component-css-var('checkbox-list', $checkbox-list);
 
   display: flex;
-  justify-content: getCssVar(form-item-container, editor-align);
+  justify-content: getCssVar(checkbox-list, text-align);
   height: 100%;
   font-size: getCssVar(checkbox-list, font-size);
   line-height: getCssVar(checkbox-list, line-height);
@@ -55,5 +55,6 @@ $checkbox-list: (
 
   @include m(readonly) {
     color: getCssVar(checkbox-list, readonly-color);
+    text-align: getCssVar(checkbox-list, text-align);
   }
 }
\ No newline at end of file
diff --git a/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.scss b/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.scss
index f21179553..0ce250af3 100644
--- a/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.scss
+++ b/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.scss
@@ -3,7 +3,7 @@ $checkbox: (
   min-height: getCssVar(editor, default, line-height),
   
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(checkbox) {
diff --git a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss
index c8fc3d836..4ea534d1e 100644
--- a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss
+++ b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss
@@ -4,7 +4,7 @@ $color-picker: (
   placeholder-color: getCssVar(editor, default, placeholder-color),
   disabled-color: getCssVar(editor, disabled, text-color),
   readonly-color: getCssVar(editor, readonly, text-color),
-  
+
   // 字体大小
   font-size: getCssVar(editor, default, font-size),
 
@@ -12,14 +12,16 @@ $color-picker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 宽度
-  picker-width: getCssVar(spacing, loose),
+  picker-width: getCssVar(spacing, base-loose),
+
+  // 高度
+  picker-height: getCssVar(spacing, base-loose),
 
   // 间隔
   picker-margin-left: getCssVar(spacing, tight),
-  picker-margin-right: getCssVar(spacing, tight),
 );
 
 @include b(color-picker) {
@@ -47,14 +49,17 @@ $color-picker: (
     color: getCssVar(color-picker, placeholder-color);
     -webkit-text-fill-color: getCssVar(color-picker, placeholder-color);
   }
+
+  input::-webkit-color-swatch-wrapper {
+    padding: 0;
+  }
   
   @include e('picker') {
     &.van-field {
       flex-shrink: 0;
       width: getCssVar(color-picker, picker-width);
-      height: 100%;
+      height: getCssVar(color-picker, picker-height);
       padding: 0;
-      margin-right: getCssVar(color-picker, picker-margin-right);
       margin-left: getCssVar(color-picker, picker-margin-left);
       background-color: transparent;
     }
diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
index cd30ce5ed..5b1e85260 100644
--- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
+++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
@@ -15,7 +15,7 @@ $mpicker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 圆角
   select-item-border-radius: getCssVar(border-radius, small),
@@ -48,9 +48,13 @@ $mpicker: (
   }
 
   .van-field__right-icon {
+    display: flex;
     align-items: center;
+    justify-content: center;
 
     button {
+      height: getCssVar(mpicker, line-height);
+      padding: 0;
       color: getCssVar(mpicker, icon-color);
       border: none;
     }
diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss
index 9170d5ffe..8000c9025 100644
--- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss
+++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss
@@ -14,7 +14,7 @@ $picker-select-view: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(picker-select-view) {
@@ -45,15 +45,13 @@ $picker-select-view: (
   .van-field__button {
     display: flex;
     align-items: center;
-    height: getCssVar(picker-select-view, line-height);
+    justify-content: center;
 
     button {
       height: getCssVar(picker-select-view, line-height);
+      padding: 0;
       color: getCssVar(picker-select-view, icon-color);
       border: none;
-      border-radius: 0;
-
-      --van-button-default-line-height: 1;
     }
 
     .van-button__text {
diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
index 957446128..1f5e2780f 100644
--- a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
+++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
@@ -16,7 +16,7 @@ $picker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 圆角
   pop-search-border-radius: getCssVar(border-radius, medium),
@@ -36,7 +36,7 @@ $picker: (
   pop-list-item-border-bottom: 1px solid getCssVar(color, border),
 
   // 清除按钮样式
-  clear-display: getCssVar(form-item-container, required-style),
+  clear-display: getCssVar(editor, default, required-style),
 );
 
 @include b('picker') {
@@ -67,6 +67,8 @@ $picker: (
     justify-content: center;
 
     button {
+      height: getCssVar(picker, line-height);
+      padding: 0;
       color: getCssVar(picker, icon-color);
       border: none;
     }
diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss
index dc700c5c8..dde6b9646 100644
--- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss
+++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss
@@ -13,7 +13,7 @@ $date-picker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 
diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
index 4965f7f0c..eac007b97 100644
--- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
+++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss
@@ -12,6 +12,9 @@ $date-range-picker: (
   // 行高
   line-height: getCssVar(editor, default, line-height),
 
+  // 文本对齐
+  text-align: getCssVar(editor, default, text-align),
+
   // 高度
   min-height: getCssVar(editor, default, line-height),
 );
@@ -26,6 +29,7 @@ $date-range-picker: (
   font-size: getCssVar(date-range-picker, font-size);
   line-height: getCssVar(date-range-picker, line-height);
   color: getCssVar(date-range-picker, color);
+  text-align: getCssVar(date-range-picker, text-align);
 
   --van-field-input-text-color: #{getCssVar(date-range-picker, color)};
   --van-cell-text-color: #{getCssVar(date-range-picker, color)};
diff --git a/src/editor/dropdown-list/ibiz-cascader-dropdown/ibiz-cascader-dropdown.scss b/src/editor/dropdown-list/ibiz-cascader-dropdown/ibiz-cascader-dropdown.scss
index 824086c4e..6131378b9 100644
--- a/src/editor/dropdown-list/ibiz-cascader-dropdown/ibiz-cascader-dropdown.scss
+++ b/src/editor/dropdown-list/ibiz-cascader-dropdown/ibiz-cascader-dropdown.scss
@@ -12,7 +12,7 @@ $cascader-dropdown: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(cascader-dropdown) {
diff --git a/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss b/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss
index 313b8e2b6..6c9f05b5c 100644
--- a/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss
+++ b/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss
@@ -13,7 +13,7 @@ $dropdown-list: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 圆角
   select-item-border-radius: getCssVar(border-radius, small),
@@ -54,6 +54,7 @@ $dropdown-list: (
   @include m(readonly) {
     color: getCssVar(dropdown-list, readonly-color);
     -webkit-text-fill-color: getCssVar(dropdown-list, readonly-color);
+    text-align: getCssVar(dropdown-list, text-align);
   }
 
   @include b(dropdown-list-select-item) {
@@ -94,11 +95,6 @@ $dropdown-list: (
     flex-direction: row;
     justify-content: getCssVar(dropdown-list, text-align);
   }
-  &.#{bem('dropdown-list','','readonly')} {
-    display: flex;
-    flex-direction: row;
-    justify-content: getCssVar(dropdown-list, text-align);
-  }
 }
 
 @include b(dropdown-list) {
diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
index 254aa5766..589517927 100644
--- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
+++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
@@ -14,7 +14,7 @@ $dropdown: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 圆角
   select-item-border-radius: getCssVar(spacing, base),
@@ -37,7 +37,7 @@ $dropdown: (
   pop-list-item-border-bottom: 1px solid getCssVar(color,border),
 
   // 清除按钮样式
-  clear-display: getCssVar(form-item-container, required-style),
+  clear-display: getCssVar(editor, default, required-style),
 );
 
 @include b(dropdown) {
@@ -47,6 +47,7 @@ $dropdown: (
   font-size: getCssVar(dropdown, font-size);
   line-height: getCssVar(dropdown, line-height);
   color: getCssVar(dropdown, color);
+  text-align: getCssVar(dropdown, text-align);
 
   --van-field-input-text-color: #{getCssVar(dropdown, color)};
   --van-cell-text-color: #{getCssVar(dropdown, color)};
diff --git a/src/editor/dropdown-list/ibiz-emoji-picker/ibiz-emoji-picker.scss b/src/editor/dropdown-list/ibiz-emoji-picker/ibiz-emoji-picker.scss
index 28c17c19a..a26563196 100644
--- a/src/editor/dropdown-list/ibiz-emoji-picker/ibiz-emoji-picker.scss
+++ b/src/editor/dropdown-list/ibiz-emoji-picker/ibiz-emoji-picker.scss
@@ -13,7 +13,7 @@ $emoji-picker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
   
   // 高度
   min-height: getCssVar(editor, default, line-height),
diff --git a/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.scss b/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.scss
index 4e61637c2..ffd86de96 100644
--- a/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.scss
+++ b/src/editor/map-picker/ibiz-map-picker/ibiz-map-picker.scss
@@ -33,6 +33,9 @@ $map-picker: (
   footer-gap: getCssVar('spacing', 'base'),
   footer-padding: 0 getCssVar('spacing', 'tight'),
   marker-text-padding: 4px 10px,
+
+  // 文本对齐
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(map-picker) {
@@ -41,6 +44,7 @@ $map-picker: (
   font-size: getCssVar(map-picker, font-size);
   line-height: getCssVar(map-picker, line-height);
   color: getCssVar(map-picker, color);
+  text-align: getCssVar(map-picker, text-align);
 
   --van-field-input-text-color: #{getCssVar(map-picker, color)};
   --van-cell-text-color: #{getCssVar(map-picker, color)};
diff --git a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.scss b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.scss
index 1b09ae5c1..fd4798421 100644
--- a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.scss
+++ b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.scss
@@ -15,7 +15,7 @@ $number-range-picker: (
   line-height: getCssVar(editor, default, line-height),
 
   // 清除按钮样式
-  clear-display: getCssVar(form-item-container, required-style),
+  clear-display: getCssVar(editor, default, required-style),
 );
 
 @include b(number-range-picker) {
diff --git a/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss b/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss
index 7e38d154a..ffa532dc6 100644
--- a/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss
+++ b/src/editor/qrcode/ibiz-qrcode/ibiz-qrcode.scss
@@ -2,6 +2,9 @@ $qrcode: (
   // 颜色
   color: getCssVar(color, disabled, text),
   width: rem(300px),
+
+  // 文本对齐
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(qrcode) {
@@ -9,7 +12,7 @@ $qrcode: (
 
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: getCssVar(qrcode, text-align);
   width: 100%;
   height: 100%;
 
diff --git a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss
index c5b1eec8e..ab1211e74 100644
--- a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss
+++ b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss
@@ -11,7 +11,7 @@ $radio: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 间距
   item-gap: getCssVar(spacing, tight),
diff --git a/src/editor/rate/ibiz-rate/ibiz-rate.scss b/src/editor/rate/ibiz-rate/ibiz-rate.scss
index 0dd330e02..c2b0a5a6c 100644
--- a/src/editor/rate/ibiz-rate/ibiz-rate.scss
+++ b/src/editor/rate/ibiz-rate/ibiz-rate.scss
@@ -6,7 +6,7 @@ $stepper: (
   min-height: getCssVar(editor, default, line-height),
   
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(rate) {
diff --git a/src/editor/raw/ibiz-raw/ibiz-raw.scss b/src/editor/raw/ibiz-raw/ibiz-raw.scss
index d8a752bbd..39f7c74e4 100644
--- a/src/editor/raw/ibiz-raw/ibiz-raw.scss
+++ b/src/editor/raw/ibiz-raw/ibiz-raw.scss
@@ -4,6 +4,9 @@ $raw: (
 
   // 行高
   line-height: getCssVar(editor, default, line-height),
+
+  // 文本对齐
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(raw){
@@ -11,4 +14,9 @@ $raw: (
 
   line-height: getCssVar(raw, line-height);
   color:getCssVar(raw, color);
+  text-align: getCssVar(raw, text-align);
+
+  .van-notice-bar {
+    text-align: left;
+  }
 }
diff --git a/src/editor/span/span-link/span-link.scss b/src/editor/span/span-link/span-link.scss
index dc272709f..8c95f6059 100644
--- a/src/editor/span/span-link/span-link.scss
+++ b/src/editor/span/span-link/span-link.scss
@@ -11,7 +11,7 @@ $span-link: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(span-link) {
diff --git a/src/editor/span/span/span.scss b/src/editor/span/span/span.scss
index ae984a290..40a96a260 100644
--- a/src/editor/span/span/span.scss
+++ b/src/editor/span/span/span.scss
@@ -12,7 +12,7 @@ $span: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 间距
   code-list-item-padding: 0 getCssVar(spacing, base-tight),
@@ -41,6 +41,14 @@ $span: (
     color: getCssVar(span, readonly-color);
   }
   @include e('code-list') {
+    @include m(icon) {
+      min-height: getCssVar(span, line-height);
+
+      &.#{bem('code-list')} .#{bem('icon')} {
+        padding-right: 0;
+      }
+    }
+
     @include when('reverse-color') {
       .#{bem('code-list','item')} {
         padding: getCssVar(span, code-list-item-padding);
diff --git a/src/editor/span/span/span.tsx b/src/editor/span/span/span.tsx
index 4a2eeda4b..6a63a2d17 100644
--- a/src/editor/span/span/span.tsx
+++ b/src/editor/span/span/span.tsx
@@ -173,6 +173,11 @@ export const IBizSpan = defineComponent({
               !!this.c.editorParams?.REVERSECOLOR ||
                 !!this.c.editorParams?.reversecolor,
             ),
+            this.ns.em(
+              'code-list',
+              this.c.editorParams?.SHOWMODE?.toLowerCase() ||
+                this.c.editorParams?.showmode?.toLowerCase(),
+            ),
           ]}
           codeListItems={this.items}
           codeList={this.c.codeList}
diff --git a/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss b/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss
index 0fa398ba3..cb12fd1ca 100644
--- a/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss
+++ b/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss
@@ -13,7 +13,7 @@ $stepper: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b(stepper) {
@@ -33,6 +33,8 @@ $stepper: (
   --van-stepper-input-disabled-text-color: #{getCssVar(stepper, disabled-color)};
 
   .van-stepper {
+    display: flex;
+
     .van-stepper__minus,
     .van-stepper__plus {
       background-color: getCssVar(stepper, bg-color);
diff --git a/src/editor/switch/ibiz-switch/ibiz-switch.scss b/src/editor/switch/ibiz-switch/ibiz-switch.scss
index 99f9278f6..70ccd125d 100644
--- a/src/editor/switch/ibiz-switch/ibiz-switch.scss
+++ b/src/editor/switch/ibiz-switch/ibiz-switch.scss
@@ -1,6 +1,6 @@
 $switch: (
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 高度
   height: var(--van-switch-height),
diff --git a/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss b/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss
index dab30b560..308d38bde 100644
--- a/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss
+++ b/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss
@@ -12,13 +12,13 @@ $input-number: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 间距
   unit-margin-left: rem(10px),
 
   // 清除按钮样式
-  clear-display: getCssVar(form-item-container, required-style),
+  clear-display: getCssVar(editor, default, required-style),
 );
 
 @include b('input-number') {
diff --git a/src/editor/text-box/input/input.scss b/src/editor/text-box/input/input.scss
index 0781e1d3a..909b54585 100644
--- a/src/editor/text-box/input/input.scss
+++ b/src/editor/text-box/input/input.scss
@@ -12,10 +12,10 @@ $input: (
   line-height: getCssVar(editor, default, line-height),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 清除按钮样式
-  clear-display: getCssVar(form-item-container, required-style),
+  clear-display: getCssVar(editor, default, required-style),
 );
 
 @include b('input') {
diff --git a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss
index 01c84aa4c..23d9c066e 100644
--- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss
+++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss
@@ -2,7 +2,6 @@ $file-upload: (
   // 颜色
   btn-color: getCssVar(color, text, 2),
   preview-item-bg-color: getCssVar(color, disabled, bg),
-  preview-item-action-color: getCssVar(color, bg, overlay),
 
   // 字体大小
   btn-font-size: getCssVar(font-size, header-4),
@@ -29,6 +28,9 @@ $file-upload: (
   preview-item-margin-top: getCssVar(spacing, tight),
   preview-item-img-padding: rem(6px),
   preview-item-text-padding-left: getCssVar(spacing, tight),
+
+  // 文本对齐
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b('file-upload') {
@@ -47,6 +49,12 @@ $file-upload: (
     width: 100%;
   }
 
+  @include m(readonly) {
+    .van-uploader {
+      display: none;
+    }
+  }
+
   @include b('file-upload-button') {
     width: getCssVar(file-upload, btn-width);
     height: getCssVar(file-upload, btn-height);
@@ -132,7 +140,6 @@ $file-upload: (
     align-items: center;
     justify-content: flex-end;
     width: getCssVar(file-upload, preview-item-action-width);
-    color: getCssVar(file-upload, preview-item-action-color);
     text-align: right;
   }
 
@@ -145,7 +152,7 @@ $file-upload: (
   .van-uploader__input-wrapper {
     display: flex;
     align-items: center;
-    justify-content: right;
+    justify-content: getCssVar(file-upload, text-align);
     width: 100%;
 
     input {
diff --git a/src/editor/upload/ibiz-image-cropping/ibiz-image-cropping.scss b/src/editor/upload/ibiz-image-cropping/ibiz-image-cropping.scss
index 471010cf7..66e94a4c8 100644
--- a/src/editor/upload/ibiz-image-cropping/ibiz-image-cropping.scss
+++ b/src/editor/upload/ibiz-image-cropping/ibiz-image-cropping.scss
@@ -1,9 +1,19 @@
 $image-upload-cropping: (
+  // 间距
+  delete-btn-top: rem(-5px),
+  delete-btn-right: rem(-5px),
+
   // 圆角
   border-radius: rem(4px),
 
+  // 透明度
+  delete-btn-opacity: 0.6,
+
+  // 边框
+  upload-border: rem(1px) solid getCssVar(color, border),
+
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b('image-upload-cropping') {
@@ -50,39 +60,46 @@ $image-upload-cropping: (
     flex-direction: row;
     justify-content: getCssVar(image-upload-cropping, text-align);
   }
-}
-
-.van-uploader__preview-delete--shadow {
-  top: rem(-5px);
-  right: rem(-5px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: var(--van-uploader-delete-icon-size);
-  height: var(--van-uploader-delete-icon-size);
-  text-align: center;
-  background: var(--van-uploader-delete-background);
-  border-radius: 50%;
-  opacity: 0.6;
-}
 
-.van-uploader__preview-delete-icon {
-  position: absolute;
-  top: 0;
-  right: 0;
-  font-size: var(--van-uploader-delete-icon-size);
-  color: var(--van-uploader-delete-color);
-  transform: scale(0.7) translate(0%, -10%);
-}
-
-.van-uploader__upload {
-  background: transparent;
-  border: getCssVar(color, border) rem(1px) solid;
-  border-radius: rem(4px);
-}
+  .van-uploader__preview-delete--shadow {
+    top: getCssVar(image-upload-cropping, delete-btn-top);
+    right: getCssVar(image-upload-cropping, delete-btn-right);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: var(--van-uploader-delete-icon-size);
+    height: var(--van-uploader-delete-icon-size);
+    text-align: center;
+    background: var(--van-uploader-delete-background);
+    border-radius: 50%;
+    opacity: getCssVar(image-upload-cropping, delete-btn-opacity);
+  }
+  
+  .van-uploader__preview-delete-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    font-size: var(--van-uploader-delete-icon-size);
+    color: var(--van-uploader-delete-color);
+    transform: scale(0.7) translate(0%, -10%);
+  }
+  
+  .van-uploader__upload {
+    margin-right: 0;
+    background: transparent;
+    border: getCssVar(image-upload-cropping, upload-border);
+    border-radius: getCssVar(image-upload-cropping, border-radius);
+  }
+  
+  .van-uploader__upload--readonly {
+    display: none;
+  }
 
-.van-uploader__upload--readonly {
-  display: none;
+  @include m(readonly) {
+    .van-uploader__preview:nth-last-of-type(2) {
+      margin-right: 0;
+    }
+  }
 }
 
 @include b(panel-field) {
diff --git a/src/editor/upload/ibiz-image-select/ibiz-image-select.scss b/src/editor/upload/ibiz-image-select/ibiz-image-select.scss
index 3be2f29b4..08fdf1a13 100644
--- a/src/editor/upload/ibiz-image-select/ibiz-image-select.scss
+++ b/src/editor/upload/ibiz-image-select/ibiz-image-select.scss
@@ -3,7 +3,7 @@ $image-select: (
   border-radius: rem(4px),
 
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 
   // 宽度
   width: var(--van-uploader-size),
@@ -56,6 +56,10 @@ $image-select: (
     height: 100%;
   }
 
+  .van-uploader__preview:nth-last-of-type(2) {
+    margin-right: 0;
+  }
+
   .van-uploader {
     width: getCssVar(image-select, width);
     height: getCssVar(image-select, height);
diff --git a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss
index 209a6a62e..919f696fe 100644
--- a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss
+++ b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss
@@ -1,9 +1,19 @@
 $image-upload: (
+  // 间距
+  delete-btn-top: rem(-5px),
+  delete-btn-right: rem(-5px),
+
   // 圆角
   border-radius: rem(4px),
 
+  // 透明度
+  delete-btn-opacity: 0.6,
+
+  // 边框
+  upload-border: rem(1px) solid getCssVar(color, border),
+
   // 文本对齐
-  text-align: getCssVar(form-item-container, editor-align),
+  text-align: getCssVar(editor, default, text-align),
 );
 
 @include b('image-upload') {
@@ -46,39 +56,46 @@ $image-upload: (
     flex-direction: row;
     justify-content: getCssVar(image-upload, text-align);
   }
-}
-
-.van-uploader__preview-delete--shadow {
-  top: rem(-5px);
-  right: rem(-5px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: var(--van-uploader-delete-icon-size);
-  height: var(--van-uploader-delete-icon-size);
-  text-align: center;
-  background: var(--van-uploader-delete-background);
-  border-radius: 50%;
-  opacity: 0.6;
-}
 
-.van-uploader__preview-delete-icon {
-  position: absolute;
-  top: 0;
-  right: 0;
-  font-size: var(--van-uploader-delete-icon-size);
-  color: var(--van-uploader-delete-color);
-  transform: scale(0.7) translate(0%, -10%);
-}
-
-.van-uploader__upload {
-  background: transparent;
-  border: getCssVar(color, border) rem(1px) solid;
-  border-radius: rem(4px);
-}
+  .van-uploader__preview-delete--shadow {
+    top: getCssVar(image-upload, delete-btn-top);
+    right: getCssVar(image-upload, delete-btn-right);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: var(--van-uploader-delete-icon-size);
+    height: var(--van-uploader-delete-icon-size);
+    text-align: center;
+    background: var(--van-uploader-delete-background);
+    border-radius: 50%;
+    opacity: getCssVar(image-upload, delete-btn-opacity);
+  }
+  
+  .van-uploader__preview-delete-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    font-size: var(--van-uploader-delete-icon-size);
+    color: var(--van-uploader-delete-color);
+    transform: scale(0.7) translate(0%, -10%);
+  }
+  
+  .van-uploader__upload {
+    margin-right: 0;
+    background: transparent;
+    border: getCssVar(image-upload, upload-border);
+    border-radius: getCssVar(image-upload, border-radius);
+  }
+  
+  .van-uploader__upload--readonly {
+    display: none;
+  }
 
-.van-uploader__upload--readonly {
-  display: none;
+  @include m(readonly) {
+    .van-uploader__preview:nth-last-of-type(2) {
+      margin-right: 0;
+    }
+  }
 }
 
 @include b(panel-field) {
-- 
Gitee