Merge branch 'qin_v10_master'

package.json

@@ -43,12 +43,14 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@tinymce/tinymce-vue": "^5.1.1",
     "@vitejs/plugin-vue": "^4.2.3",
+    "@vueup/vue-quill": "^1.2.0",
     "@vueuse/core": "^10.1.2",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "5.1.10",
     "@wecom/jssdk": "^1.3.2",
     "axios": "^1.4.0",
     "clipboard": "^2.0.11",
+    "compressorjs": "^1.2.1",
     "echarts": "^5.4.3",
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
@@ -61,6 +63,8 @@
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.0",
     "pinia": "^2.1.6",
+    "quill-image-resize-custom-module": "^4.1.7",
+    "quill-image-uploader": "^1.3.0",
     "screenfull": "^6.0.0",
     "sortablejs": "^1.15.2",
     "spark-md5": "^3.0.2",

src/api/api/index.ts

@@ -0,0 +1,13 @@
+import request from '@/utils/request';
+
+
+/**
+ * 获取离职率http://localhost:9999/dev-api/api/upordown
+ */
+ export function uploadFilesSysFile(data?: any) {
+	return request({
+	  url: "/api/upordown",
+	  method: 'post',
+	  data: data
+	});
+}

src/components/DesignForm/app/index.vue

@@ -322,7 +322,7 @@ onMounted(()=>{
 */
 const judjeRadio = (val: any, options: any[]) => {
 	// console.log("判断单选值",val, options)
-	if(options.length > 0){
+	if(options && options.length > 0){
 		options.forEach((item)=>{
 			if(item.value == val){
 				console.log("判断单选值",val, item.value,item.label)

src/components/DesignForm/public/quillEditor.vue

@@ -0,0 +1,389 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-25 08:57:59
+@ 备注: QuillEditor 富文本编辑器
+-->
+<template>
+	<div :style="'display: block; width: 100%; height: '+height+'; padding-bottom: 25px; border: 1px solid #Eeeeee;'">
+		<QuillEditor
+			ref="quillRef"
+			v-model:content="content"
+			:options="myOptions"
+			contentType="html"
+			@update:content="setValue()"
+		/>
+	</div>
+</template>
+<script setup>
+import Compressor from 'compressorjs';
+import { QuillEditor, Quill } from '@vueup/vue-quill';
+import '@vueup/vue-quill/dist/vue-quill.snow.css';
+import ImageUploader from 'quill-image-uploader';
+import ImageResize from 'quill-image-resize-custom-module';
+import { uploadFilesSysFile } from '@/api/api';
+import '@/styles/QuillFont.css'; // 字体和字体大小的自定义文件
+
+
+
+// 设置行高的配置======start
+const lineHeight = ['1', '1.25', '1.5', '1.75', '2.5', '3', '5'];
+const parchment = Quill.import('parchment');
+const lineHeightConfig = {
+	scope: parchment.Scope.INLINE,
+	whitelist: lineHeight,
+};
+const lineHeightStyle = new parchment.Attributor.Style(
+	'lineHeight',
+	'line-height',
+	lineHeightConfig,
+);
+Quill.register({ 'formats/lineHeight': lineHeightStyle }, true);
+// 设置行高的配置======end
+ 
+const props = defineProps({
+	// 左侧菜单数据
+	modelValue: String,
+	height:{
+		type:String,
+		default:"500px"
+	},
+});
+const emit = defineEmits(['update:modelValue']);
+const content = ref('');
+const quillRef = ref(null);
+// 设置字体大小
+const fontSizeStyle = Quill.import('attributors/style/size'); // 引入这个后会把样式写在style上
+fontSizeStyle.whitelist = [
+	'12px',
+	'14px',
+	'16px',
+	'18px',
+	'20px',
+	'22px',
+	'24px',
+	'28px',
+	'30px',
+	'32px',
+	'34px',
+	'36px',
+	'38px',
+	'40px',
+	'42px',
+	'44px',
+	'46px',
+	'48px',
+	'50px',
+	'52px',
+	'54px',
+	'56px',
+	'60px',
+];
+// 设置字体
+const fontStyle = Quill.import('attributors/style/font'); // 引入这个后会把样式写在style上
+fontStyle.whitelist = [
+	'SimSun', // 宋体
+	'SimHei', // 黑体
+	'STFANGSO', // 华文仿宋
+	'Microsoft-YaHei', // 微软雅黑
+	'KaiTi', // 楷体
+	'FangSong', // 仿宋
+	'STKAITI', // 华文楷体
+	'Arial',
+	'Times-New-Roman',
+	'sans-serif',
+];
+ 
+Quill.register(fontSizeStyle, true);
+Quill.register(fontStyle, true);
+Quill.register('modules/imageUploader', ImageUploader);
+Quill.register('modules/imageResize', ImageResize);
+ 
+// 图片压缩
+const compressImage = (file) => {
+	return new Promise((resolve, reject) => {
+		// eslint-disable-next-line no-new
+		new Compressor(file, {
+			quality: 0.6, // 设置压缩质量
+			success(result) {
+				resolve(result);
+			},
+			error(error) {
+				reject(error);
+			},
+		});
+	});
+};
+// 富文本配置项，将模块功能一起写入到配置项内，也可以单独配置Modules
+const myOptions = reactive({
+	modules: {
+		toolbar: {
+			container: [
+				['bold', 'italic', 'underline', 'strike'], // 加粗、斜体、下划线、删除线
+				[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题，不同级别的标题
+				[{ align: [] }], // 对齐方式
+				['blockquote', 'code-block'], // 引用，代码块
+				[{ script: 'sub' }, { script: 'super' }], // 上标/下标
+				[{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+				[{ indent: '-1' }, { indent: '+1' }], // 缩进
+				['link', 'image', 'video'], // 超链接 图片 视频
+				[{ direction: 'rtl' }], // 文本方向
+				[{ color: [] }, { background: [] }], // 字体颜色和背景色
+				[{ size: fontSizeStyle.whitelist }], // 字体大小
+				[{ font: fontStyle.whitelist }], // 字体
+				[{ lineheight: lineHeight }], // 设置行高
+				['clean'], // 清除格式
+			],
+			handlers: {
+				lineheight: (value) => {
+					const editor = quillRef.value.getQuill();
+					if (value) {
+						editor.format('lineHeight', value);
+					}
+				},
+			},
+		},
+		
+		// 设置图片的大小--可拖拽设置大小
+		imageResize: {
+			parchment: Quill.import('parchment'),
+		},
+	},
+	placeholder: '请输入内容...',
+});
+ 
+const setValue = () => {
+	// 用于设置双向绑定值
+	const text = toRaw(quillRef.value).getHTML();
+	emit('update:modelValue', text);
+};
+ 
+watch(
+	() => props.modelValue,
+	(val) => {
+		if (val) {
+			content.value = val; // 用于监听绑定值进行数据回填
+		} else {
+			// eslint-disable-next-line no-unused-expressions
+			toRaw(quillRef.value) && toRaw(quillRef.value).setContents(''); // 可用于弹窗使用富文本框关闭弹窗清除值
+		}
+	},
+	{
+		immediate: true, // 组件创建时立即执行一次回调
+	},
+);
+</script>
+<style>
+.ql-container {
+	height: calc(100% - 42px);
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='SimHei']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='SimHei']::before {
+	font-family: SimHei;
+	content: '黑体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Microsoft-YaHei']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Microsoft-YaHei']::before {
+	font-family: 'Microsoft YaHei';
+	content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='KaiTi']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='KaiTi']::before {
+	font-family: KaiTi;
+	content: '楷体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='FangSong']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='FangSong']::before {
+	font-family: FangSong;
+	content: '仿宋';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='SimSun']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='SimSun']::before {
+	font-family: SimSun;
+	content: '宋体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='STFANGSO']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='STFANGSO']::before {
+	font-family: STFANGSO;
+	content: '华文仿宋';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='STKAITI']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='STKAITI']::before {
+	font-family: STKAITI;
+	content: '华文楷体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Arial']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Arial']::before {
+	font-family: Arial;
+	content: 'Arial';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Times-New-Roman']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Times-New-Roman']::before {
+	font-family: 'Times New Roman';
+	content: 'Times New Roman';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='sans-serif']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='sans-serif']::before {
+	font-family: sans-serif;
+	content: 'sans-serif';
+}
+.ql-font-SimSun {
+	font-family: SimSun;
+}
+.ql-font-SimHei {
+	font-family: SimHei;
+}
+.ql-font-Microsoft-YaHei {
+	font-family: 'Microsoft YaHei';
+}
+.ql-font-KaiTi {
+	font-family: KaiTi;
+}
+.ql-font-FangSong {
+	font-family: FangSong;
+}
+.ql-font-Arial {
+	font-family: Arial;
+}
+.ql-font-Times-New-Roman {
+	font-family: 'Times New Roman';
+}
+.ql-font-sans-serif {
+	font-family: sans-serif;
+}
+ 
+/* 字号设置 */
+ 
+/* 默认字号 */
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+	content: '字号';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='12px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='12px']::before {
+	font-size: 12px;
+	content: '12px';
+}
+.ql-size-12px {
+	font-size: 12px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='14px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='14px']::before {
+	font-size: 14px;
+	content: '14px';
+}
+.ql-size-14px {
+	font-size: 14px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='16px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='16px']::before {
+	font-size: 16px;
+	content: '16px';
+}
+.ql-size-16px {
+	font-size: 16px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='18px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='18px']::before {
+	font-size: 18px;
+	content: '18px';
+}
+.ql-size-18px {
+	font-size: 18px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='20px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='20px']::before {
+	font-size: 20px;
+	content: '20px';
+}
+.ql-size-20px {
+	font-size: 20px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='22px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='22px']::before {
+	font-size: 22px;
+	content: '22px';
+}
+.ql-size-24px {
+	font-size: 24px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='24px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='24px']::before {
+	font-size: 24px;
+	content: '24px';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='26px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='26px']::before {
+	font-size: 26px;
+	content: '26px';
+}
+.ql-size-26px {
+	font-size: 26px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='28px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='28px']::before {
+	font-size: 28px;
+	content: '28px';
+}
+.ql-size-28px {
+	font-size: 28px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='30px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='30px']::before {
+	font-size: 30px;
+	content: '30px';
+}
+.ql-size-30px {
+	font-size: 30px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='32px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='32px']::before {
+	font-size: 32px;
+	content: '32px';
+}
+.ql-size-32px {
+	font-size: 32px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='36px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='36px']::before {
+	font-size: 36px;
+	content: '36px';
+}
+.ql-size-36px {
+	font-size: 36px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='40px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='40px']::before {
+	font-size: 40px;
+	content: '40px';
+}
+.ql-size-40px {
+	font-size: 40px;
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-label::before {
+	content: '行高';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1']::before {
+	content: '1';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1.5']::before {
+	content: '1.5';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1.75']::before {
+	content: '1.75';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='2']::before {
+	content: '2';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='3']::before {
+	content: '3';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='4']::before {
+	content: '4';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='5']::before {
+	content: '5';
+}
+.ql-snow .ql-picker.ql-lineheight {
+	width: 70px;
+}
+</style>

src/components/DesignForm/tableListPage/index.vue

@@ -311,7 +311,7 @@ onMounted(()=>{
 */
 const judjeRadio = (val: any, options: any[]) => {
 	// console.log("判断单选值",val, options)
-	if(options.length > 0){
+	if(options && options.length > 0){
 		options.forEach((item)=>{
 			if(item.value == val){
 				console.log("判断单选值",val, item.value,item.label)

src/components/workflow/drwer/approverDrawer.vue

@@ -524,6 +524,15 @@ const nodeSetUp = ref("first")
 							</el-row>
 						</div>
 					</el-tab-pane>
+					<el-tab-pane name="helpInstructions">
+						<template #label>
+							<span class="wordKeyCss">帮助说明</span>
+						</template>
+						<div class="info_box">
+							<QuillEditor v-model="approverConfig.helpTips" height="400px" />
+						</div>
+					</el-tab-pane>
+					{{approverConfig.helpTips}}
 				</el-tabs>
 
 			</div>

src/components/workflow/drwer/copyerDrawer.vue

@@ -71,6 +71,10 @@ const closeDrawer = () => {
                 <el-checkbox-group v-model="ccSelfSelectFlag" class="clear">
                     <el-checkbox :label="1">允许发起人自选抄送人</el-checkbox>
                 </el-checkbox-group>
+				<div class="info_box">
+					<QuillEditor v-model="copyerConfig.helpTips" height="400px" />
+				</div>
+				
             </div>
 			<div class="demo-drawer__footer clear">
                 <el-button type="primary" @click="saveCopyer">确 定</el-button>

src/components/workflow/drwer/promoterDrawer.vue

@@ -10,6 +10,7 @@ import $func from '@/utils/workflow/index'
 import { useStore } from '@/store/workflow/index' 
 
 import { analysisForm,setFlowFormKeyPower } from '@/api/workflowapi/index'
+import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
 
 
 const props = defineProps({
@@ -27,6 +28,10 @@ const props = defineProps({
 		type:String,
 		default:""
 	},
+	nodeConfig:{
+		type: Object,
+        default: () => ({}),
+	},
 });
 const emits = defineEmits<{
     (e: 'update:formData', val: any): void
@@ -41,6 +46,8 @@ const formData =  computed({
 	}
 });
 
+
+
 //当前节点操作权限
 // const 
 
@@ -50,6 +57,7 @@ let checkedList = ref([])
 
 let store = useStore()
 let { setPromoter, setFlowPermission } = store
+let approverConfig1 = computed(():any=> store.approverConfig1)
 let promoterDrawer = computed(()=> store.promoterDrawer)
 let flowPermission1 = computed(()=> store.flowPermission1)
 let visible = computed({
@@ -170,6 +178,7 @@ watch(()=>visible.value,(val:boolean)=>{
 	}
 })
 const nodeSetUp = ref("first")
+const contentpage = ref("")
 </script>
 <template>
 	<el-drawer v-model="visible" :append-to-body="true" title="发起人"  class="set_promoter" :show-close="false" :size="550" :before-close="closeDrawer"> 
@@ -228,8 +237,16 @@ const nodeSetUp = ref("first")
 							</el-row>
 						</div>
 					</el-tab-pane>
+					<el-tab-pane name="helpInstructions">
+						<template #label>
+							<span class="wordKeyCss">帮助说明</span>
+						</template>
+						<div class="info_box">
+							<QuillEditor v-model="props.nodeConfig.helpTips" height="400px" />
+						</div>
+					</el-tab-pane>
 				</el-tabs>
-				<!-- {{formData}} -->
+				{{props.nodeConfig.helpTips}}
             </div>
 			
             <div class="demo-drawer__footer clear">

src/main.ts

@@ -28,6 +28,8 @@ import ComWidget from '@/widget/index'
 import AKDesign from '@/views/sysworkflow/codepage/index'
 import * as pinia  from './store/index'
 
+
+
 const app = createApp(App);
 // 全局注册 自定义指令(directive)
 setupDirective(app);

src/styles/QuillFont.css

@@ -0,0 +1,297 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='SimHei']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='SimHei']::before {
+	font-family: SimHei;
+	content: '黑体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Microsoft-YaHei']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Microsoft-YaHei']::before {
+	font-family: 'Microsoft YaHei';
+	content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='KaiTi']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='KaiTi']::before {
+	font-family: KaiTi;
+	content: '楷体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='FangSong']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='FangSong']::before {
+	font-family: FangSong;
+	content: '仿宋';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='SimSun']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='SimSun']::before {
+	font-family: SimSun;
+	content: '宋体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='STFANGSO']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='STFANGSO']::before {
+	font-family: STFANGSO;
+	content: '华文仿宋';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='STKAITI']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='STKAITI']::before {
+	font-family: STKAITI;
+	content: '华文楷体';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Arial']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Arial']::before {
+	font-family: Arial;
+	content: 'Arial';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='Times-New-Roman']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='Times-New-Roman']::before {
+	font-family: 'Times New Roman';
+	content: 'Times New Roman';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='sans-serif']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='sans-serif']::before {
+	font-family: sans-serif;
+	content: 'sans-serif';
+}
+.ql-font-SimSun {
+	font-family: SimSun;
+}
+.ql-font-SimHei {
+	font-family: SimHei;
+}
+.ql-font-Microsoft-YaHei {
+	font-family: 'Microsoft YaHei';
+}
+.ql-font-KaiTi {
+	font-family: KaiTi;
+}
+.ql-font-FangSong {
+	font-family: FangSong;
+}
+.ql-font-Arial {
+	font-family: Arial;
+}
+.ql-font-Times-New-Roman {
+	font-family: 'Times New Roman';
+}
+.ql-font-sans-serif {
+	font-family: sans-serif;
+}
+ 
+/* 字号设置 */
+.ql-picker-options{
+	overflow: auto;
+    height: 200px;
+}
+/* 默认字号 */
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+	content: '字号';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='12px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='12px']::before {
+	font-size: 12px;
+	content: '12px';
+}
+.ql-size-12px {
+	font-size: 12px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='14px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='14px']::before {
+	font-size: 14px;
+	content: '14px';
+}
+.ql-size-14px {
+	font-size: 14px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='16px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='16px']::before {
+	font-size: 16px;
+	content: '16px';
+}
+.ql-size-16px {
+	font-size: 16px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='18px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='18px']::before {
+	font-size: 18px;
+	content: '18px';
+}
+.ql-size-18px {
+	font-size: 18px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='20px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='20px']::before {
+	font-size: 20px;
+	content: '20px';
+}
+.ql-size-20px {
+	font-size: 20px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='22px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='22px']::before {
+	font-size: 22px;
+	content: '22px';
+}
+.ql-size-24px {
+	font-size: 24px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='24px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='24px']::before {
+	font-size: 24px;
+	content: '24px';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='26px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='26px']::before {
+	font-size: 26px;
+	content: '26px';
+}
+.ql-size-26px {
+	font-size: 26px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='28px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='28px']::before {
+	font-size: 28px;
+	content: '28px';
+}
+.ql-size-28px {
+	font-size: 28px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='30px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='30px']::before {
+	font-size: 30px;
+	content: '30px';
+}
+.ql-size-30px {
+	font-size: 30px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='32px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='32px']::before {
+	font-size: 32px;
+	content: '32px';
+}
+.ql-size-32px {
+	font-size: 32px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='36px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='36px']::before {
+	font-size: 36px;
+	content: '36px';
+}
+.ql-size-36px {
+	font-size: 36px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='40px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='40px']::before {
+	font-size: 40px;
+	content: '40px';
+}
+.ql-size-40px {
+	font-size: 40px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='42px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='42px']::before {
+	font-size: 42px;
+	content: '42px';
+}
+.ql-size-42px {
+	font-size: 42px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='44px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='44px']::before {
+	font-size: 44px;
+	content: '44px';
+}
+.ql-size-44px {
+	font-size: 44px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='46px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='46px']::before {
+	font-size: 46px;
+	content: '46px';
+}
+.ql-size-46px {
+	font-size: 46px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='48px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='48px']::before {
+	font-size: 48px;
+	content: '48px';
+}
+.ql-size-48px {
+	font-size: 48px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='50px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='50px']::before {
+	font-size: 50px;
+	content: '50px';
+}
+.ql-size-50px {
+	font-size: 50px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='52px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='52px']::before {
+	font-size: 52px;
+	content: '52px';
+}
+.ql-size-52px {
+	font-size: 52px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='54px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='54px']::before {
+	font-size: 54px;
+	content: '54px';
+}
+.ql-size-54px {
+	font-size: 54px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='56px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='56px']::before {
+	font-size: 56px;
+	content: '56px';
+}
+.ql-size-56px {
+	font-size: 56px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='58px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='58px']::before {
+	font-size: 58px;
+	content: '58px';
+}
+.ql-size-58px {
+	font-size: 58px;
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='60px']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='60px']::before {
+	font-size: 60px;
+	content: '60px';
+}
+.ql-size-60px {
+	font-size: 60px;
+}
+
+
+
+.ql-snow .ql-picker.ql-lineheight .ql-picker-label::before {
+	content: '行高';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1']::before {
+	content: '1';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1.5']::before {
+	content: '1.5';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='1.75']::before {
+	content: '1.75';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='2']::before {
+	content: '2';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='3']::before {
+	content: '3';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='4']::before {
+	content: '4';
+}
+.ql-snow .ql-picker.ql-lineheight .ql-picker-item[data-value='5']::before {
+	content: '5';
+}
+.ql-snow .ql-picker.ql-lineheight {
+	width: 70px;
+}

src/types/components.d.ts

@@ -138,6 +138,7 @@ declare module '@vue/runtime-core' {
     Pagination: typeof import('./../components/Pagination/index.vue')['default']
     PositionDialog: typeof import('./../components/workflow/dialog/positionDialog.vue')['default']
     PromoterDrawer: typeof import('./../components/workflow/drwer/promoterDrawer.vue')['default']
+    QuillEditor: typeof import('./../components/DesignForm/public/quillEditor.vue')['default']
     RightPanel: typeof import('./../components/RightPanel/index.vue')['default']
     RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue

@@ -584,7 +584,7 @@ const closwFormFlow = () => {
 				</section>
 
 				<errorDialog v-model:visible="tipVisible" :list="tipList" />
-				<promoterDrawer v-model:form-data="state.formData" :form-key="appPageKey" :form-version="formVersion" />
+				<promoterDrawer v-model:form-data="state.formData" :form-key="appPageKey" :form-version="formVersion" :node-config="nodeConfig" />
 				<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig"  :is-form-flow="isFormFlow"  :customer-form-key="appPageKey"  v-model:form-data="state.formData"  :form-version="formVersion" />
 				<copyerDrawer />
 				<conditionDrawer  :is-form-flow="isFormFlow"  :customer-form-key="appPageKey" />

src/widget/index.ts

@@ -23,6 +23,9 @@ import OwnerPage from './systemunit/ownerPage.vue'
 import DeptOrgPage from './systemunit/deptOrgPage.vue'
 
 
+// import { QuillEditor } from '@vueup/vue-quill'
+// import '@vueup/vue-quill/dist/vue-quill.snow.css';
+
 export default (app: any)	=> {
 	app.component('SerialNumber', serialNumber)
 	app.component('UrlLink', urlLink)
@@ -44,4 +47,6 @@ export default (app: any)	=> {
 	app.component('EditTime',EditTime)		//创建时间主键
 	app.component('OwnerPage',OwnerPage)		//选择拥有者 
 	app.component('DeptOrgPage',DeptOrgPage)		//所属部门
+
+	// app.component('QuillEditor', QuillEditor)		//所属部门
 }