diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 6d8567c9b..ae386a073 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2032,7 +2032,7 @@ const cssIsShouw = (val:any) => {
 						</el-tooltip>
 						</el-button>
 					</div>
-					<el-divider content-position="left">组件布局</el-divider>
+					<el-divider content-position="left">高级属性</el-divider>
 					
 					<LayoutPage v-if="cssIsShouw(attrList)"  v-model:styles-val="controlDataStyls" :place="controlData.type" />
 
@@ -2216,7 +2216,7 @@ const cssIsShouw = (val:any) => {
 						</el-radio-group>
 						</el-form-item>
 						<el-form-item label="是否隐藏星号" class="form_cont">
-						<el-switch v-model="formData.hideRequiredAsterisk" active-text="显示" inactive-text="隐藏" />
+						<el-switch v-model="formData.hideRequiredAsterisk" active-text="隐藏" inactive-text="显示" style="--el-switch-on-color: #ff4949; --el-switch-off-color: #13ce66" />
 						</el-form-item>
 						<el-form-item label="校验错误信息" class="form_cont">
 						<el-switch v-model="formData.showMessage" active-text="显示" inactive-text="隐藏" />
diff --git a/src/components/DesignForm/layoutPage/index.vue b/src/components/DesignForm/layoutPage/index.vue
index d341e77aa..69ebb4487 100644
--- a/src/components/DesignForm/layoutPage/index.vue
+++ b/src/components/DesignForm/layoutPage/index.vue
@@ -31,7 +31,7 @@ const inputUnitTitle = (val:string) => {
 	console.log("inputUnitTitle",val);
 	switch (val) {
 		case "radio":
-			return "Radio布局"
+			return "输入设置"
 			break;
 		case "select":
 			unitIsShow.value = false;
@@ -76,10 +76,10 @@ const inputUnitTitle = (val:string) => {
 		default:
 			unitIsShow.value = true;
 			labelIsShow.value = true;
-			return "Input布局"
+			return "输入设置"
 			break;
 	}
-	return "Input布局"
+	return "输入设置"
 }
 // const divStyle = reactive<any>({})
 // watch(()=>divStyle,(val : any)=>{
@@ -104,10 +104,10 @@ const activeName = ref('0')
 </script>
 <template>
 	<div class="jhk_kjh">
-	当前组件类别======>{{props.place}}
+	<!-- 当前组件类别======>{{props.place}} -->
         <el-collapse v-model="activeName" accordion>
 
-            <el-collapse-item title="边框布局" name="1">
+            <el-collapse-item title="边框设置" name="1">
 
                 <el-divider content-position="left">外框</el-divider>
                 <DesignLayout v-model:layouyt-style="props.stylesVal.divStyle" />
@@ -125,7 +125,7 @@ const activeName = ref('0')
 
             </el-collapse-item>
 
-            <el-collapse-item v-if="labelIsShow" title="Lable布局" name="2">
+            <el-collapse-item v-if="labelIsShow" title="标签设置" name="2">
                 <el-divider content-position="left">外框</el-divider>
                 <DesignLayout v-model:layouyt-style="props.stylesVal.labelStyle" />
                 <el-divider content-position="left">圆角</el-divider>
@@ -154,7 +154,7 @@ const activeName = ref('0')
                 <TextPage  v-model:layouyt-style="props.stylesVal.inputStyle" :place="'div'" />
             </el-collapse-item>
 
-			<el-collapse-item v-if="buttionShow" title="按钮布局" name="2">
+			<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>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 6466cd8b4..63c98191e 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -23,11 +21,14 @@ declare module '@vue/runtime-core' {
     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']
+    ElAffix: typeof import('element-plus/es')['ElAffix']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     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']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
@@ -55,19 +56,25 @@ declare module '@vue/runtime-core' {
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     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']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     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']
+    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -76,8 +83,11 @@ declare module '@vue/runtime-core' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -101,15 +111,26 @@ declare module '@vue/runtime-core' {
     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']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPicture: typeof import('~icons/ep/picture')['default']
     IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
+    IEpTop: typeof import('~icons/ep/top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+    IEpUser: typeof import('~icons/ep/user')['default']
+    IEpView: typeof import('~icons/ep/view')['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']
@@ -150,4 +171,3 @@ declare module '@vue/runtime-core' {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
   }
 }
->>>>>>> v7_master