diff --git a/src/control/form/form-detail/form-item/form-item.scss b/src/control/form/form-detail/form-item/form-item.scss
index 74f71e508a60b5e4e8e397878e4722f97fa12049..8a16148757e21b6c41159eb01fe340e2c0753a15 100644
--- a/src/control/form/form-detail/form-item/form-item.scss
+++ b/src/control/form/form-detail/form-item/form-item.scss
@@ -1,14 +1,16 @@
 $form-item: (
   'text-color': getCssVar('text-color'),
   'hover-color': getCssVar('color', 'primary'),
+  'hover-bg-color': #f3f3f3,
+  'readonly-color': getCssVar('text-color', 'readonly'),
   'border-color': getCssVar('border-color'),
   'font-size': getCssVar('font-size', 'base'),
   'error-font-size': getCssVar('font-size', 'extra-small'),
   'error-color': getCssVar('color', 'error'),
   'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'disable-color': getCssVar('disabled', 'text-color'),
-  'disable-bg-color': getCssVar('disabled', 'bg-color'),
-  'disable-border-color': getCssVar('disabled', 'border-color'),
+  'disabled-color': getCssVar('disabled', 'text-color'),
+  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
+  'disabled-border-color': getCssVar('disabled', 'border-color'),
   'line-height': 32px,
 );
 
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 ea3e2394804b25dca065076d15f6083e59b8134e..b4c843a299cd96d81d10da157bec98c7c647ddd1 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
@@ -1,17 +1,10 @@
-/* checkbox 复选框列表 */
-$checkbox-list: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-);
 @include b('checkbox-list') {
-  @include set-component-css-var('checkbox-list', $checkbox-list);
-
   @include e('text') {
-    font-size: getCssVar('checkbox-list', 'font-size');
-    color: getCssVar('checkbox-list', 'text-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
index cc80f5fd02947696204aa343e5f9bbaeec8f71ac..d9a5a1d98fd47688b8b9413e1d416ca1503af516 100644
--- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
+++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.scss
@@ -1,28 +1,19 @@
 /* mpicker 地址栏 */
 $mpicker: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
   'height': 32px,
-  'hover-color': getCssVar('color', 'primary'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
 );
 
 @include b('mpicker') {
-  @include set-component-css-var('mpicker', $mpicker);
   @include flex;
 
   input::placeholder {
-    color: getCssVar('mpicker', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   .el-input.is-disabled .el-input__inner {
-    color: getCssVar('mpicker', 'disabled-text-color');
-    background-color: getCssVar('mpicker', 'disabled-bg-color');
-    border-color: getCssVar('mpicker', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   .el-select {
@@ -43,7 +34,7 @@ $mpicker: (
     position: absolute;
     right: 0;
     height: getCssVar('mpicker', 'height');
-    color: getCssVar('mpicker', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
     @include flex(row, center, center);
   }
 
@@ -54,6 +45,6 @@ $mpicker: (
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.scss b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.scss
index d617ce97d4ff5fec588336c73a41a8fa03499dac..e734dfe31d3b47bb743fe81e8dc699ba625b4b75 100644
--- a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.scss
+++ b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.scss
@@ -1,38 +1,25 @@
-/* picker-dropdown 数据选择下拉列表 */
-$picker-dropdown: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
-);
-
 @include b('picker-dropdown') {
-  @include set-component-css-var('picker-dropdown', $picker-dropdown);
-
   .el-select {
     width: 100%;
   }
 
   .el-input .el-input__inner {
-    font-size: getCssVar('picker-dropdown', 'font-size');
-    color: getCssVar('picker-dropdown', 'text-color');
-    border-color: getCssVar('picker-dropdown', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   .el-input .el-input__inner::placeholder {
-    color: getCssVar('picker-dropdown', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   .el-input.is-disabled .el-input__inner {
-    color: getCssVar('picker-dropdown', 'disabled-text-color');
-    background-color: getCssVar('picker-dropdown', 'disabled-bg-color');
-    border-color: getCssVar('picker-dropdown', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.scss b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.scss
index b936a434454c005f325fc03590a2d85a3a392936..88e683121325f24ceae778f6eb20626ce48803a1 100644
--- a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.scss
+++ b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.scss
@@ -1,11 +1,11 @@
 @include b(picker-link) {
-  color: getCssVar('color', 'primary');
+  color: getCssVar('form-item', 'text-color');
   cursor: pointer;
 
   @include m(disabled) {
     cursor: not-allowed;
   }
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
index f6c186248f592a6faa7b8bcd7ecea181ab2c6224..4af444a9fc395013955110ca8b6eb3cd599756ff 100644
--- a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
+++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss
@@ -1,33 +1,23 @@
 /* picker 数据选择 */
 $picker: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
   'height': 32px,
-  'hover-bg-color': #f3f3f3,
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
 );
 
 @include b('picker') {
-  @include set-component-css-var('picker', $picker);
-
   .el-input .el-input__inner {
-    font-size: getCssVar('picker', 'font-size');
-    color: getCssVar('picker', 'text-color');
-    border-color: getCssVar('picker', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   .el-input .el-input__inner::placeholder {
-    color: getCssVar('picker', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   .el-input.is-disabled .el-input__inner {
-    color: getCssVar('picker', 'disabled-text-color');
-    background-color: getCssVar('picker', 'disabled-bg-color');
-    border-color: getCssVar('picker', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   ion-icon {
@@ -64,7 +54,7 @@ $picker: (
     cursor: pointer;
 
     &:hover {
-      background-color: getCssVar('picker', 'hover-bg-color');
+      background-color: getCssVar('form-item', 'hover-bg-color');
     }
   }
 
@@ -82,6 +72,6 @@ $picker: (
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
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 453954bc9e01f2be0a799c11bbd237bf25842e26..0130114f423be7af21a28e0154929f84ddebdea4 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
@@ -1,37 +1,25 @@
-/* date-picker 日期选择器 */
-$date-picker: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
-);
 @include b('date-picker') {
-  @include set-component-css-var('date-picker', $date-picker);
-
   .el-date-editor {
     width: 100%;
   }
 
   input {
-    font-size: getCssVar('date-picker', 'font-size');
-    color: getCssVar('date-picker', 'text-color');
-    border-color: getCssVar('date-picker', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   input::placeholder {
-    color: getCssVar('date-picker', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   input[disabled] {
-    color: getCssVar('date-picker', 'disabled-text-color');
-    background-color: getCssVar('date-picker', 'disabled-bg-color');
-    border-color: getCssVar('date-picker', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
index 16ba56e9be6a1c5f2c5dc4832481b1f714dca1d7..1c8870eb903771935a7c6cac8ee59f0a898f03de 100644
--- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
+++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
@@ -1,15 +1,3 @@
-/* dropdown 下拉列表 */
-$dropdown: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'hover-color': getCssVar('color', 'primary'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
-);
-
 @include b(dropdown) {
   .el-select {
     width: 100%;
diff --git a/src/editor/list-box/ibiz-list-box/ibiz-list-box.scss b/src/editor/list-box/ibiz-list-box/ibiz-list-box.scss
index 7cef0d32d82eada036489b33f54556681683c366..5425709d70de76df290f3425d4c6be1d4579c1cc 100644
--- a/src/editor/list-box/ibiz-list-box/ibiz-list-box.scss
+++ b/src/editor/list-box/ibiz-list-box/ibiz-list-box.scss
@@ -3,9 +3,23 @@
   overflow: auto;
   @include b(list-box-radio) {
     @include flex(column, flex-start, flex-start);
+
+    .el-radio {
+      .el-radio__label {
+        font-size: getCssVar('form-item', 'font-size');
+        color: getCssVar('form-item', 'text-color');
+      }
+    }
   }
 
   @include b(list-box-checkbox) {
     @include flex(column, flex-start, flex-start);
+
+    .el-checkbox {
+      .el-checkbox__label {
+        font-size: getCssVar('form-item', 'font-size');
+        color: getCssVar('form-item', 'text-color');
+      }
+    }
   }
 }
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 d90f4b35e31e650c6246e8b95208438fb576fe43..6ad0be4f6e962980e697055dac634ad9af93de92 100644
--- a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss
+++ b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.scss
@@ -1,18 +1,10 @@
-/* radio 单选框 */
-$radio: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-);
-
 @include b('radio') {
-  @include set-component-css-var('radio', $radio);
-
   @include e('text') {
-    font-size: getCssVar('radio', 'font-size');
-    color: getCssVar('radio', 'text-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/span/span-link/span-link.scss b/src/editor/span/span-link/span-link.scss
index 80bfdf9eccf693ee8bbf3655de487659e861073a..90d6e90bdae20c5b2ed0846a9363e1679358be05 100644
--- a/src/editor/span/span-link/span-link.scss
+++ b/src/editor/span/span-link/span-link.scss
@@ -1,11 +1,11 @@
 @include b(span-link) {
-  color: getCssVar('color', 'primary');
+  color: getCssVar('form-item', 'hover-color');
   cursor: pointer;
 
   @include m(disabled) {
     cursor: not-allowed;
   }
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
diff --git a/src/editor/span/span/span.scss b/src/editor/span/span/span.scss
index 500574084e7297f2c8a50d3ad82664a2dcb7bfaf..fe41e9798c1b5561b2af3aaeffcea31c0ba60442 100644
--- a/src/editor/span/span/span.scss
+++ b/src/editor/span/span/span.scss
@@ -1,19 +1,12 @@
-/* span 标签 */
-$span: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-);
 @include b('span') {
-  @include set-component-css-var('span', $span);
-
-  font-size: getCssVar('span', 'font-size');
-  color: getCssVar('span', 'text-color');
+  font-size: getCssVar('form-item', 'font-size');
+  color: getCssVar('form-item', 'text-color');
 
   @include m(disabled) {
-    color: getCssVar('text-color', 'disabled');
+    color: getCssVar('form-item', 'disabled-color');
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 }
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 e2efa075e0742eced10c87c134f2d187270869bd..7c375f25b0c940a721f3c3430c63cf43fc942b92 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
@@ -1,45 +1,33 @@
-/* input-number 数值框 */
-$input-number: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
-);
-
 @include b('input-number') {
-  @include set-component-css-var('input-number', $input-number);
-
   // 常规样式
   .el-input .el-input__inner {
-    font-size: getCssVar('input-number', 'font-size');
-    color: getCssVar('input-number', 'text-color');
-    border-color: getCssVar('input-number', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   .el-input .el-input__inner::placeholder {
-    color: getCssVar('input-number', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   // 禁用样式
   .el-input.is-disabled .el-input__inner {
-    color: getCssVar('input-number', 'disabled-text-color');
-    background-color: getCssVar('input-number', 'disabled-bg-color');
-    border-color: getCssVar('input-number', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   // 只读模式显示
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
+
     @include overflow-wrap;
   }
 
   // 单位后缀样式
   .#{bem('input-number','unit')} {
     margin-left: 10px;
-    font-size: getCssVar('input-number', 'font-size');
+    font-size: getCssVar('form-item', 'font-size');
     font-style: normal;
   }
 }
diff --git a/src/editor/text-box/input/input.scss b/src/editor/text-box/input/input.scss
index 34733faf95340e7d644f91ac5132d2739457bfc4..21131111b0bac28f0a843df49d1b94c5fd54fd26 100644
--- a/src/editor/text-box/input/input.scss
+++ b/src/editor/text-box/input/input.scss
@@ -1,58 +1,45 @@
-/* input 文本框 */
-$input: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'placeholder-color': getCssVar('text-color', 'placeholder'),
-  'disabled-text-color': getCssVar('disabled', 'text-color'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-  'disabled-border-color': getCssVar('disabled', 'border-color'),
-);
-
 @include b('input') {
-  @include set-component-css-var('input', $input);
-
   .el-input .el-input__inner {
-    font-size: getCssVar('input', 'font-size');
-    color: getCssVar('input', 'text-color');
-    border-color: getCssVar('input', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   .el-input .el-input__inner::placeholder {
-    color: getCssVar('input', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
   }
 
   .el-input.is-disabled .el-input__inner {
-    color: getCssVar('input', 'disabled-text-color');
-    background-color: getCssVar('input', 'disabled-bg-color');
-    border-color: getCssVar('input', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   .el-textarea .el-textarea__inner {
-    font-size: getCssVar('input', 'font-size');
-    color: getCssVar('input', 'text-color');
-    border-color: getCssVar('input', 'border-color');
+    font-size: getCssVar('form-item', 'font-size');
+    color: getCssVar('form-item', 'text-color');
+    border-color: getCssVar('form-item', 'border-color');
   }
 
   .el-textarea.is-disabled .el-textarea__inner {
-    color: getCssVar('input', 'disabled-text-color');
-    background-color: getCssVar('input', 'disabled-bg-color');
-    border-color: getCssVar('input', 'disabled-border-color');
+    color: getCssVar('form-item', 'disabled-color');
+    background-color: getCssVar('form-item', 'disabled-bg-color');
+    border-color: getCssVar('form-item', 'disabled-border-color');
   }
 
   .el-textarea .el-textarea__inner::placeholder {
-    color: getCssVar('input', 'placeholder-color');
+    color: getCssVar('form-item', 'placeholder-color');
     @include overflow-wrap;
   }
 
   @include m(readonly) {
-    color: getCssVar('text-color', 'readonly');
+    color: getCssVar('form-item', 'readonly-color');
   }
 
   // 单位后缀样式
   .el-input__suffix {
     .#{bem('input','unit')} {
-      font-size: getCssVar('input', 'font-size');
+      font-size: getCssVar('form-item', 'font-size');
       font-style: normal;
     }
   }
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 7fc76b94389dd799c9e3985711d2cc054cc70577..6fe09229b3d349f5c908cf8d2e1a4e3e0af78333 100644
--- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss
+++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.scss
@@ -1,25 +1,14 @@
-/* file-upload 文件上传 */
-$file-upload: (
-  'font-size': getCssVar('font-size', 'base'),
-  'text-color': getCssVar('text-color'),
-  'border-color': getCssVar('border-color'),
-  'hover-color': getCssVar('color', 'primary'),
-  'disabled-bg-color': getCssVar('disabled', 'bg-color'),
-);
-
 @include b('file-upload') {
-  @include set-component-css-var('file-upload', $file-upload);
-
   @include b('file-upload-button') {
     span {
-      font-size: getCssVar('file-upload', 'font-size');
-      color: getCssVar('file-upload', 'text-color');
+      font-size: getCssVar('form-item', 'font-size');
+      color: getCssVar('form-item', 'text-color');
     }
   }
 
   .el-button:hover {
     span {
-      color: getCssVar('file-upload', 'hover-color');
+      color: getCssVar('form-item', 'hover-color');
     }
   }
 
@@ -31,15 +20,15 @@ $file-upload: (
     @include flex(row, flex-start, center, nowrap);
 
     flex: 0 0 auto;
-    color: getCssVar('file-upload', 'text-color');
+    color: getCssVar('form-item', 'text-color');
 
     &:hover {
       @include flex(row, flex-start, center, nowrap);
 
-      background: getCssVar('file-upload', 'disabled-bg-color');
+      background: getCssVar('form-item', 'disabled-bg-color');
 
       span {
-        color: getCssVar('file-upload', 'hover-color');
+        color: getCssVar('form-item', 'hover-color');
       }
     }
   }
@@ -47,14 +36,14 @@ $file-upload: (
   // 禁用态样式
   @include m('disabled') {
     .el-upload-list__item > span {
-      color: getCssVar('text-color', 'disabled');
+      color: getCssVar('form-item', 'disabled-color');
     }
   }
 
   // 只读态样式
   @include m('readonly') {
     .el-upload-list__item > span {
-      color: getCssVar('text-color', 'readonly');
+      color: getCssVar('form-item', 'readonly-color');
     }
   }
 }
diff --git a/src/panel-component/panel-container/panel-container.scss b/src/panel-component/panel-container/panel-container.scss
index cd31f3f429ef3eca264d253cf0795bac55b96497..5602aab9860ed6591f744b682e9e75930dc2f382 100644
--- a/src/panel-component/panel-container/panel-container.scss
+++ b/src/panel-component/panel-container/panel-container.scss
@@ -44,6 +44,7 @@ $panel-container: (
   height: 100%;
   > .#{bem('row')} {
     height: 100%;
+    overflow: auto;
   }
 }