Merge changes Idef4818b,I65527e5d,I8e2e0631 into pre-release

* changes: amis-saas-6135 [Bug] 非云舍主题的应用，页面设计器无法使用 amis-saas-6135 [Bug] 非云舍主题的应用，页面设计器无法使用修改：cxd前缀主题切换问题
2024-12-15 09:21:13 +08:00 · 2022-08-31 16:15:57 +08:00 · 2022-08-31 16:15:57 +08:00 · e57483435c
commit e57483435c
parent fe853e86e6 560af2c680
2 changed files with 4 additions and 2 deletions
--- a/packages/amis-editor/src/plugin/Form/InputRange.tsx
+++ b/packages/amis-editor/src/plugin/Form/InputRange.tsx
@ -204,8 +204,9 @@ export class RangeControlPlugin extends BasePlugin {
                    value: 0
                  },
                  {
-                    type: 'tpl',
-                    tpl: '-'
+                    type: 'html',
+                    html: '-',
+                    className: 'inputGroup-split-line'
                  },
                  {
                    type: 'input-number',
--- a/packages/amis-editor/src/tpl/common.tsx
+++ b/packages/amis-editor/src/tpl/common.tsx
@ -1002,6 +1002,7 @@ setSchemaTpl(
      visibleOn,
      label: '图标',
      type: 'icon-picker',
+      className: 'fix-icon-picker-overflow',
      placeholder: '点击选择图标',
      clearable: true,
      description: ''