From 83859b685a02f196aafcaffb35335e0113711f56 Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Wed, 17 Aug 2022 10:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/cool/lib/menu/index.ts                |  4 +++-
 build/cool/lib/menu/rules.ts                |  8 +-------
 src/modules/base/components/editor/wang.vue | 11 ++++++++---
 src/modules/demo/views/editor-quill.vue     |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build/cool/lib/menu/index.ts b/build/cool/lib/menu/index.ts
index f18baf6..a2a666a 100644
--- a/build/cool/lib/menu/index.ts
+++ b/build/cool/lib/menu/index.ts
@@ -232,7 +232,9 @@ export async function createMenu({ router, columns, prefix, api, filePath }: any
 			upsert.items.push(format(item));
 		}
 
-		if (!["cl-codemirror", "cl-editor-quill"].includes(column.component?.name)) {
+		if (
+			!["cl-codemirror", "cl-editor-quill", "cl-editor-wang"].includes(column.component?.name)
+		) {
 			table.columns.push(format(column));
 		}
 	});
diff --git a/build/cool/lib/menu/rules.ts b/build/cool/lib/menu/rules.ts
index 0541686..289b4ed 100644
--- a/build/cool/lib/menu/rules.ts
+++ b/build/cool/lib/menu/rules.ts
@@ -177,11 +177,8 @@ export default [
 	},
 	{
 		test: ["rich", "text", "html", "content", "introduce", "description", "desc"],
-		table: {
-			name: "cl-editor-quill"
-		},
 		form: {
-			name: "cl-editor-quill",
+			name: "cl-editor-wang",
 			props: {
 				height: 400
 			}
@@ -189,9 +186,6 @@ export default [
 	},
 	{
 		test: ["code", "codes"],
-		table: {
-			name: "cl-codemirror"
-		},
 		form: {
 			name: "cl-codemirror",
 			props: {
diff --git a/src/modules/base/components/editor/wang.vue b/src/modules/base/components/editor/wang.vue
index cd763c4..2de724d 100644
--- a/src/modules/base/components/editor/wang.vue
+++ b/src/modules/base/components/editor/wang.vue
@@ -37,9 +37,10 @@
 
 <script lang="ts" name="cl-editor-wang" setup>
 import "@wangeditor/editor/dist/css/style.css";
-import { onBeforeUnmount, ref, shallowRef, watch, PropType, reactive } from "vue";
+import { onBeforeUnmount, ref, shallowRef, watch, PropType, reactive, computed } from "vue";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import { IEditorConfig } from "@wangeditor/editor";
+import { isNumber } from "lodash-es";
 
 const props = defineProps({
 	modelValue: String,
@@ -48,8 +49,8 @@ const props = defineProps({
 		default: "default"
 	},
 	height: {
-		type: String,
-		default: "400px"
+		type: [String, Number],
+		default: 400
 	}
 });
 
@@ -59,8 +60,12 @@ const ImageSpace = ref();
 const VideoSpace = ref();
 const editorRef = shallowRef();
 
+// 内容
 const value = ref();
 
+// 编辑器高度
+const height = computed(() => (isNumber(props.height) ? `${props.height}px` : props.height));
+
 watch(
 	() => props.modelValue,
 	(val) => {
diff --git a/src/modules/demo/views/editor-quill.vue b/src/modules/demo/views/editor-quill.vue
index ce5faaa..10c3bef 100644
--- a/src/modules/demo/views/editor-quill.vue
+++ b/src/modules/demo/views/editor-quill.vue
@@ -2,12 +2,12 @@
 	<div class="editor scroller1">
 		<div class="item">
 			<p class="title">Wang</p>
-			<cl-editor-wang v-model="w" height="400px" />
+			<cl-editor-wang v-model="w" :height="300" />
 		</div>
 
 		<div class="item">
 			<p class="title">Quill</p>
-			<cl-editor-quill v-model="q" height="400px" />
+			<cl-editor-quill v-model="q" :height="300" />
 		</div>
 	</div>
 </template>