Merge branch 'qin_v4'

src/assets/scss/form.css

@@ -201,7 +201,7 @@
   font-size: 14px;
   height: 30px;
   padding: 0 5px;
-  margin-bottom: 22px;
+  margin-bottom: 0px;
 }
 
 .add-form .form-tabs .drag {

src/assets/scss/form.scss

@@ -53,7 +53,7 @@ $mainColor: #66b1ff;
       }
     }
   }
-  .title {border-bottom: 1px solid #ddd;font-weight: 700;font-size: 14px;height: 30px;padding: 0 5px;margin-bottom: 22px}
+  .title {border-bottom: 1px solid #ddd;font-weight: 700;font-size: 14px;height: 30px;padding: 0 5px;margin-bottom: 0px}
   .form-tabs {
     .drag {min-height: 80px;}
   }

src/components/DesignForm/public/form/formItem.vue

@@ -1106,14 +1106,10 @@ const pickUserVal = (val:any) => {
 			
 			<template v-if="data.type === 'tinymce'">
 				<!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->
-				<tinymce-edit
-					v-bind="control"
-					:config="config"
-					:disabled="judgeIsDisabled(data.name)"
 				
-					v-model:model-value="value"
+				<div class="app-container" v-if="[1, 2, 3].includes(type as number)">
-					v-if="[1, 2, 3].includes(type as number)"
+					<editor  v-if="[1, 2, 3].includes(type as number)" v-bind="control" v-model="value" :disabled="judgeIsDisabled(data.name)" style="height: 500px" />
-				/>
+				</div>
 				<img
 					alt=""
 					:src="TextImg"

src/components/DesignForm/public/form/tinymce.vue

@@ -125,7 +125,7 @@ const fileUpload = (callback: any, value: string, meta: any) => {
 const defaultInit = {
     plugins: buttonPlugins, // 插件配置
     toolbar: toolbar, // 工具栏配置，设为false则隐藏
-    menubar: true, // 菜单栏配置，设为false则隐藏，不配置则默认显示全部菜单，也可自定义配置--查看 http://tinymce.ax-z.cn/configure/editor-appearance.php --搜索“自定义菜单”
+    menubar: false, // 菜单栏配置，设为false则隐藏，不配置则默认显示全部菜单，也可自定义配置--查看 http://tinymce.ax-z.cn/configure/editor-appearance.php --搜索“自定义菜单”
     //emoticons_database_url: './tinymce/emoticons/js/emojis.js',
     // eslint-disable-next-line max-len
     font_formats:'微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;', // 字体样式 微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif, 宋体=simsun,serif,仿宋体=FangSong,黑体=SimHei,Arial=arial,

src/components/WangEditor/index.vue

@@ -85,6 +85,13 @@ onBeforeUnmount(() => {
 
   #editor-container {
     flex-grow: 1;
+		.add-form .title{
+			margin-bottom: 0px;
 		}
   }
+	.w-e-bar-item button .title{
+		margin-bottom: 0px;
+	}
+}
+
 </style>

src/views/sysworkflow/codepage/page.vue

@@ -45,12 +45,19 @@ function sendMessage() {
     console.error('WebSocket 连接未打开');
   }
 }
+
+import Editor from "@/components/WangEditor/index.vue";
+const value = ref("初始内容");
 </script>
 <template>
 	<div>
 		<input v-model="message" placeholder="输入消息" />
     	<button @click="sendMessage">发送</button>
 	</div>
+
+	<div class="app-container">
+    <editor v-model="value" style="height: calc(100vh - 124px)" />
+  </div>
 </template>
 <style  lang='scss' scoped>
 

src/widget/index.ts

@@ -22,7 +22,7 @@ import FounderTime from './systemunit/founderTime.vue'
 import EditTime from './systemunit/editTime.vue'
 import OwnerPage from './systemunit/ownerPage.vue'
 import DeptOrgPage from './systemunit/deptOrgPage.vue'
-
+import Editor from "@/components/WangEditor/index.vue";
 
 // import { QuillEditor } from '@vueup/vue-quill'
 // import '@vueup/vue-quill/dist/vue-quill.snow.css';
@@ -50,5 +50,5 @@ export default (app: any)	=> {
 	app.component('OwnerPage',OwnerPage)		//选择拥有者 
 	app.component('DeptOrgPage',DeptOrgPage)		//所属部门
 
-	// app.component('QuillEditor', QuillEditor)		//所属部门
+	app.component('Editor', Editor)		//Editor富文本
 }

src/widget/lowcodeimage/lowcodeImage.vue

@@ -206,7 +206,7 @@ watch(() =>props.imgUrl,(val)=>{
 
 </script>
 <template>
-	<div>{{showMode}}------》{{styleObject}}
+	<div>
 <!-- <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" /> -->
 	<el-upload