From 190ff9f6c329110b782010c7b833570f8a0ac1b8 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <2betop.cn@gmail.com>
Date: Tue, 26 Mar 2024 17:04:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BC=95=E5=85=A5=20c?=
 =?UTF-8?q?ss=20=E7=9A=84=E6=96=B9=E5=BC=8F=20(#9885)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 调整弹窗错误提示逻辑,显示后 3 秒消失 (#9868)

* chore: 公式编辑器 input 换成 codemirror 提升交互体验 (#9821)

* style: 调整公式部分样式

* feat: 条件组合与公式结合时支持自定义输入框类型 (#9871)

* fix: 修改引入 css 的方式

* fix: 修改引入 css 的方式
---
 packages/amis-ui/scss/_thirds.scss             | 2 ++
 packages/amis-ui/src/components/CodeMirror.tsx | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/amis-ui/scss/_thirds.scss b/packages/amis-ui/scss/_thirds.scss
index b8b14c630..a4687e291 100644
--- a/packages/amis-ui/scss/_thirds.scss
+++ b/packages/amis-ui/scss/_thirds.scss
@@ -1,4 +1,6 @@
 @import '../../../node_modules/codemirror/lib/codemirror';
+@import '../../../node_modules/codemirror/theme/base16-dark';
+@import '../../../node_modules/codemirror/theme/idea';
 @import '../../../node_modules/froala-editor/css/froala_style.min';
 @import '../../../node_modules/froala-editor/css/froala_editor.pkgd.min';
 @import '../../../node_modules/tinymce/skins/ui/oxide/skin';
diff --git a/packages/amis-ui/src/components/CodeMirror.tsx b/packages/amis-ui/src/components/CodeMirror.tsx
index 9c8e99bd9..8803f182a 100644
--- a/packages/amis-ui/src/components/CodeMirror.tsx
+++ b/packages/amis-ui/src/components/CodeMirror.tsx
@@ -4,8 +4,8 @@ import type CodeMirror from 'codemirror';
 import {autobind, changedEffect} from 'amis-core';
 import {resizeSensor} from 'amis-core';
 
-import 'codemirror/theme/idea.css';
-import 'codemirror/theme/base16-dark.css';
+// import 'codemirror/theme/idea.css';
+// import 'codemirror/theme/base16-dark.css';
 // import 'codemirror/theme/base16-light.css';
 
 export interface CodeMirrorEditorProps {