Merge branch 'v7_master'

# Conflicts:
#	src/types/components.d.ts

src/api/DesignForm/types.ts

@@ -8,6 +8,11 @@ export interface FormList {
 	columns?: any // 布局字段
 	tableData?: any // 子表时
 	options?: Options[] // radio;checkbox;select选项
+	styles:{
+		divStyle:{},
+		labelStyle:{},
+		inputStyle:{}
+	}
 }
 export interface Options {
 	label: string
@@ -46,6 +51,11 @@ export interface FormData {
 	  afterSubmit?: Function
 	  change?: Function
 	}
+	styles:{
+		divStyle:{},
+		labelStyle:{},
+		inputStyle:{}
+	}
 }
 
 export interface TableData {

src/components/DesignForm/assembly/index.ts

@@ -402,6 +402,18 @@ const selectOption: any = [
 	  title: '高级字段',
 	  children: [
 		{
+			type: 'table',
+			label: '子表',
+			icon: 'table',
+			iconFont: 'fa-table',
+			list: [],
+			tableData: [], // 子表表格列表数据集合
+			control: {
+			  border: true
+			},
+			config: {
+			  addBtnText: '添加一行'
+			},
 			styles:{
 				divStyle:{},
 				labelStyle:{},

src/components/DesignForm/designLayout/bianXian.vue

@@ -128,7 +128,7 @@ watch(()=>props.dataVal.lineColorVal,(val : any)=>{
 });
 </script>
 <template>
-    <table style="width:100%">
+    <table style="width:94%; margin-left:3%">
         <tr>
             <td width="50">方向</td>
             <td>
@@ -142,14 +142,15 @@ watch(()=>props.dataVal.lineColorVal,(val : any)=>{
         <tr>
             <td>颜色</td>
             <td>
-                <el-color-picker v-model="props.dataVal.lineColorVal" :predefine="predefineColors"  size="default" />
+                <el-color-picker v-model="props.dataVal.lineColorVal" :predefine="predefineColors"  size="default" show-alpha />
                 {{ props.dataVal.lineColorVal }}
             </td>
         </tr>
         <tr>
             <td>宽度</td>
             <td>
-                <el-input-number v-model="props.dataVal.boxWidth" min="0" controls-position="right"></el-input-number>Px
+                <el-input-number v-model="props.dataVal.boxWidth" min="0" controls-position="right">
+				</el-input-number>PX
             </td>
         </tr>
         <tr>

src/components/DesignForm/designLayout/pageSize.vue

@@ -147,7 +147,7 @@ const xiuShi  = (val:any) =>{
 }
 </script>
 <template>
-    <el-row>
+    <el-row style="width:94%; margin-left:3%">
         <el-col :span="24">
 			<el-switch
 				v-model="props.layouytStyle.widthStatus"
@@ -164,7 +164,7 @@ const xiuShi  = (val:any) =>{
 					<td width="70">宽度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.width">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -172,7 +172,7 @@ const xiuShi  = (val:any) =>{
 					<td>最大宽度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthMax">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -180,7 +180,7 @@ const xiuShi  = (val:any) =>{
 					<td>最小宽度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthMin">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -192,7 +192,7 @@ const xiuShi  = (val:any) =>{
 					<td width="70">Xs</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthXs">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -200,7 +200,7 @@ const xiuShi  = (val:any) =>{
 					<td>Sm</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthSm">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -208,7 +208,7 @@ const xiuShi  = (val:any) =>{
 					<td>Md</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthMd">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -216,7 +216,7 @@ const xiuShi  = (val:any) =>{
 					<td>Lg</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthLg">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -224,7 +224,7 @@ const xiuShi  = (val:any) =>{
 					<td>Xl</td>
 					<td>
 						<el-input v-model="props.layouytStyle.widthXl">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -237,7 +237,7 @@ const xiuShi  = (val:any) =>{
 					<td width="70">高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.height">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -245,7 +245,7 @@ const xiuShi  = (val:any) =>{
 					<td>最大高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.heightMax">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -253,7 +253,7 @@ const xiuShi  = (val:any) =>{
 					<td>最小高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.heightMin">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>

src/components/DesignForm/designLayout/pageSizeSmail.vue

@@ -122,12 +122,12 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 })
 </script>
 <template>
-    <table style="width:100%">
+    <table style="width:94%; margin-left:3%">
 		<tr>
 			<td width="70">宽度</td>
 			<td>
 				<el-input v-model="props.layouytStyle.width">
-					<template #append>PX</template>
+					<template #suffix>PX</template>
 				</el-input>
 			</td>
 		</tr>
@@ -135,7 +135,7 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 			<td>最大宽度</td>
 			<td>
 				<el-input v-model="props.layouytStyle.widthMax">
-					<template #append>PX</template>
+					<template #suffix>PX</template>
 				</el-input>
 			</td>
 		</tr>
@@ -143,7 +143,7 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 			<td>最小宽度</td>
 			<td>
 				<el-input v-model="props.layouytStyle.widthMin">
-					<template #append>PX</template>
+					<template #suffix>PX</template>
 				</el-input>
 			</td>
 		</tr>
@@ -151,7 +151,7 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 					<td >高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.height">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -159,7 +159,7 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 					<td>最大高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.heightMax">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>
@@ -167,7 +167,7 @@ watch(()=>props.layouytStyle.objectFit,(val:any) => {
 					<td>最小高度</td>
 					<td>
 						<el-input v-model="props.layouytStyle.heightMin">
-							<template #append>PX</template>
+							<template #suffix>PX</template>
 						</el-input>
 					</td>
 				</tr>

src/components/DesignForm/designLayout/textPage.vue

@@ -74,14 +74,30 @@ const fontWeightList = [
 		label:"bolder",
 	}
 ];
+const textColor = ref([
+    '#ff4500',
+    '#ff8c00',
+    '#ffd700',
+    '#90ee90',
+    '#00ced1',
+    '#1e90ff',
+    '#c71585',
+    'rgba(255, 69, 0, 0.68)',
+    'rgb(255, 120, 0)',
+    'hsv(51, 100, 98)',
+    'hsva(120, 40, 94, 0.5)',
+    'hsl(181, 100%, 37%)',
+    'hsla(209, 100%, 56%, 0.73)',
+    '#c7158577',
+])
 </script>
 <template>
-    <table style="width:100%">
+    <table style="width:94%; margin-left:3%">
         <tr>
 			<td width="70">字号</td>
 			<td>
 				<el-input v-model="props.layouytStyle.fontSize">
-					<template #append>PX</template>
+					<template #suffix>PX</template>
 				</el-input>
 			</td>
 		</tr>
@@ -106,7 +122,7 @@ const fontWeightList = [
 			<td width="70">行高</td>
 			<td>
 				<el-input v-model="props.layouytStyle.fontHight">
-					<template #append>PX</template>
+					<template #suffix>PX</template>
 				</el-input>
 			</td>
 		</tr>
@@ -130,8 +146,8 @@ const fontWeightList = [
         <tr>
             <td width="50">颜色</td>
             <td>
-                <el-color-picker v-model="props.layouytStyle.fontColor" size="default" />
+                <el-color-picker v-model="props.layouytStyle.fontColor" :predefine="textColor"  size="default" show-alpha />
-                {{ props.layouytStyle.backgroundColor }}
+                {{ props.layouytStyle.fontColor }}
             </td>
         </tr>
     </table>

src/components/DesignForm/designLayout/unitBackGround.vue

@@ -40,16 +40,44 @@ watch(()=>transparency,(val : any)=>{
 {
     deep: true
 });
-if(props.layouytStyle.backgroundColor){
+if(props.layouytStyle.transparency){
-    props.layouytStyle.backgroundColor = 100
+    if(props.layouytStyle.transparency == "" || props.layouytStyle.transparency == null){
+		props.layouytStyle.transparency = 100
 	}
+}else{
+	props.layouytStyle.transparency = 100
+}
+// if(props.layouytStyle.backgroundColor){
+//     if(props.layouytStyle.backgroundColor == "" || props.layouytStyle.backgroundColor == null){
+// 		props.layouytStyle.backgroundColor = 'rgba(255, 255, 255, 1)'
+// 	}
+// }else{
+// 	props.layouytStyle.backgroundColor = 'rgba(255, 255, 255, 1)'
+// }
+const predefineColorsd = ref([
+    '#ff4500',
+    '#ff8c00',
+    '#ffd700',
+    '#90ee90',
+    '#00ced1',
+    '#1e90ff',
+    '#c71585',
+    'rgba(255, 69, 0, 0.68)',
+    'rgb(255, 120, 0)',
+    'hsv(51, 100, 98)',
+    'hsva(120, 40, 94, 0.5)',
+    'hsl(181, 100%, 37%)',
+    'hsla(209, 100%, 56%, 0.73)',
+    '#c7158577',
+])
 </script>
 <template>
-    <table style="width:100%">
+    <table style="width:94%; margin-left:3%">
         <tr>
             <td width="50">颜色</td>
             <td>
-                <el-color-picker v-model="props.layouytStyle.backgroundColor"   size="default" />
+                <el-color-picker v-model="props.layouytStyle.backgroundColor" :predefine="predefineColorsd" show-alpha  size="default" />
+			
                 {{ props.layouytStyle.backgroundColor }}
             </td>
         </tr>

src/components/DesignForm/designLayout/yuanjao.vue

@@ -124,7 +124,7 @@ const calculationProperties = () =>{
 }
 </script>
 <template>
-    <table style="width:100%">
+    <table style="width:94%; margin-left:3%">
         <tr>
             <td style="width:55px">
                 <el-image style="width: 20px; height: 20px; cursor: pointer;" :src="BianKuangYj" :fit="'fit'" @click.top="boxHornCope(1)" />

src/components/DesignForm/formControlAttr.vue

@@ -2033,6 +2033,7 @@ const cssIsShouw = (val:any) => {
 						</el-button>
 					</div>
 					<el-divider content-position="left">组件布局</el-divider>
+					
 					<LayoutPage v-if="cssIsShouw(attrList)"  v-model:styles-val="controlDataStyls" :place="controlData.type" />
 
 

src/components/DesignForm/layoutPage/index.vue

@@ -24,6 +24,7 @@ const props = defineProps({
 		default:""
 	}
 });
+const buttionShow = ref(false)
 const unitIsShow = ref(true)
 const labelIsShow = ref(true)
 const inputUnitTitle = (val:string) => {
@@ -53,20 +54,28 @@ const inputUnitTitle = (val:string) => {
 		case "rate":
 			unitIsShow.value = false;
 			break;
-		case "slider":
+		case "slider","upload","tinymce":
 			unitIsShow.value = false;
 			break;
-		case "treeSelect":
+		case "treeSelect","colorPicker","signaturemap":
 			unitIsShow.value = false;
 			break;
-		case "txt":
+		case "txt","table","videoUpAndPlay","lowcodeCarsusel","grid","tabs":
 			unitIsShow.value = false;
 			labelIsShow.value = false;
 			break;
 		case "title":
 			unitIsShow.value = false;
 			break;
+		case "button":
+			buttionShow.value = true;
+			unitIsShow.value = false;
+			labelIsShow.value = false;
+			break;
+		
 		default:
+			unitIsShow.value = true;
+			labelIsShow.value = true;
 			return "Input布局"
 			break;
 	}
@@ -144,6 +153,16 @@ const activeName = ref('0')
                 <el-divider content-position="left">文本</el-divider>
                 <TextPage  v-model:layouyt-style="props.stylesVal.inputStyle" :place="'div'" />
             </el-collapse-item>
+
+			<el-collapse-item v-if="buttionShow" title="按钮布局" name="2">
+                <el-divider content-position="left">尺寸</el-divider>
+                <PageSizeSmail  v-model:layouyt-style="props.stylesVal.labelStyle" :place="'div'" />
+                <el-divider content-position="left">文本</el-divider>
+                <TextPage  v-model:layouyt-style="props.stylesVal.labelStyle" :place="'div'" />
+            </el-collapse-item>
+
+
+
         </el-collapse>
     </div>
 </template>

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

@@ -59,6 +59,11 @@ const props = withDefaults(
 				form: {},
 				config: {
 					style:''
+				},
+				styles:{
+					divStyle:{},
+					labelStyle:{},
+					inputStyle:{}
 				}
 			}
 		},

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

@@ -164,6 +164,13 @@ const getGroupName = (item: any) => {
     }
 }
 // 点击激活当前
+/**
+ * styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
+			}
+ */
 const groupClick = (item: any, ele?: string) => {
     // 设计模式下才执行
     if (type.value !== 5) {
@@ -172,6 +179,14 @@ const groupClick = (item: any, ele?: string) => {
     if (ele) {
       	item.type = ele
     }
+	if(!item.styles){
+		item.styles={
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
+			}
+	}
+	// console.log("点击激活当前--->",item)
     store.setActiveKey(getGroupName(item))
     store.setControlAttr(item)
     // grid时显示添加列按钮
@@ -299,7 +314,7 @@ const getFormItemLableStyle = (ele: any) => {
 				v-show="linksShow(element, index)"
 				v-if="linksIf(element)"
 			>
-			{{element}}
+			<!-- {{element}} -->
 				<!--选项卡组件-->
 				<template v-if="element.type === 'tabs'">
 					<div class="form-tabs">
@@ -436,8 +451,9 @@ const getFormItemLableStyle = (ele: any) => {
 						<el-button
 						v-bind="element.control"
 						@click="clickBtn(element.control)"
+						color="#626aef"
 						>
-							{{ element.control?.label }}
+						<td :style="getFormItemLableStyle(element.styles)">{{ element.control?.label }}</td>
 						</el-button>
 					</div>
 					

src/types/components.d.ts

@@ -0,0 +1,153 @@
+<<<<<<< HEAD
+=======
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default']
+    AddNode: typeof import('./../components/workflow/addNode.vue')['default']
+    ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default']
+    BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default']
+    Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
+    ChildTable: typeof import('./../components/DesignForm/public/form/childTable.vue')['default']
+    ConditionDrawer: typeof import('./../components/workflow/drwer/conditionDrawer.vue')['default']
+    CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
+    DesignLayoutButPage: typeof import('./../components/DesignForm/designLayout/designLayoutButPage.vue')['default']
+    DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default']
+    DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
+    DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
+    ElAside: typeof import('element-plus/es')['ElAside']
+    ElAvatar: typeof import('element-plus/es')['ElAvatar']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
+    ElDropdown: typeof import('element-plus/es')['ElDropdown']
+    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
+    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMain: typeof import('element-plus/es')['ElMain']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
+    EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
+    EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
+    ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default']
+    FlexBox: typeof import('./../components/DesignForm/public/form/flexBox.vue')['default']
+    Flow: typeof import('./../components/DesignForm/public/form/components/flow.vue')['default']
+    Form: typeof import('./../components/DesignForm/public/form/form.vue')['default']
+    Form2: typeof import('./../components/DesignForm/public/form/form2.vue')['default']
+    FormControlAttr: typeof import('./../components/DesignForm/formControlAttr.vue')['default']
+    FormControlAttr_2024024: typeof import('./../components/DesignForm/formControlAttr_2024024.vue')['default']
+    FormControlAttres: typeof import('./../components/DesignForm/formControlAttres.vue')['default']
+    FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default']
+    FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default']
+    FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default']
+    FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
+    GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default']
+    Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
+    HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default']
+    HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
+    IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpClose: typeof import('~icons/ep/close')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpSearch: typeof import('~icons/ep/search')['default']
+    IEpSetting: typeof import('~icons/ep/setting')['default']
+    LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
+    LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
+    List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
+    ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
+    MathFormula: typeof import('./../components/DesignForm/math/mathFormula.vue')['default']
+    Matrix: typeof import('./../components/workflow/dialog/matrix.vue')['default']
+    MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default']
+    NodeWrap: typeof import('./../components/workflow/nodeWrap.vue')['default']
+    PageSize: typeof import('./../components/DesignForm/designLayout/pageSize.vue')['default']
+    PageSizeSmail: typeof import('./../components/DesignForm/designLayout/pageSizeSmail.vue')['default']
+    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']
+    RightPanel: typeof import('./../components/RightPanel/index.vue')['default']
+    RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    Screen: typeof import('./../components/DesignForm/public/form/components/screen.vue')['default']
+    Select: typeof import('./../components/DesignForm/public/form/select.vue')['default']
+    SelectBoxs: typeof import('./../components/workflow/selectBoxs.vue')['default']
+    SelectResult: typeof import('./../components/workflow/selectResult.vue')['default']
+    SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default']
+    SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default']
+    SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
+    Template: typeof import('./../components/DesignForm/template.vue')['default']
+    TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default']
+    Tinymce: typeof import('./../components/DesignForm/public/form/tinymce.vue')['default']
+    Tinymce_1: typeof import('./../components/DesignForm/public/form/tinymce_1.vue')['default']
+    Tooltip: typeof import('./../components/DesignForm/tooltip.vue')['default']
+    UnitBackGround: typeof import('./../components/DesignForm/designLayout/unitBackGround.vue')['default']
+    User: typeof import('./../components/DesignForm/public/expand/user.vue')['default']
+    UserDialog: typeof import('./../components/DesignForm/public/expand/userDialog.vue')['default']
+    VueFile: typeof import('./../components/DesignForm/vueFile.vue')['default']
+    WangEditor: typeof import('./../components/WangEditor/index.vue')['default']
+    Yuanjao: typeof import('./../components/DesignForm/designLayout/yuanjao.vue')['default']
+  }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
+}
+>>>>>>> v7_master

src/views/sysworkflow/codepage/createform.vue

@@ -60,6 +60,11 @@ const submitButton = {
       config:
       {
         textAlign: "center"
+      },
+			styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
 			}
     }]
 }
@@ -84,6 +89,11 @@ const cancelButton = {
       config:
       {
         textAlign: "center"
+      },
+			styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
 			}
     }]
 }
@@ -108,6 +118,11 @@ const submitAndCancelButton = {
       config:
       {
         span: 0
+      },
+			styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
 			}
     },
     {
@@ -121,6 +136,11 @@ const submitAndCancelButton = {
       config:
       {
         span: 0
+      },
+			styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
 			}
     }]
 };
@@ -168,7 +188,12 @@ const state = reactive<formStruct>({
 				name:'',
 				formName: props.formconfigcont.formName
       },
-      config: {}
+      config: {},
+			styles:{
+				divStyle:{},
+				labelStyle:{},
+				inputStyle:{}
+			}
     },
     editor: {},
     loading: false,

src/widget/digitpage/index.vue

@@ -15,7 +15,7 @@
 			<span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
 			<Tooltips :content="config.help" />
 		</template>
-		<template #label v-else>1
+		<template #label v-else>
 			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
 		</template>
 		<div  v-if="type === 4"  class="form-value" v-html="value"></div>