push Develop

src/component/Detail/habitSetStyle.vue

@@ -10,6 +10,7 @@
 		:mask="habitSetStyleMask"
 		:keyboard="false"
 		:destroyOnClose="true"
+		:zIndex="1050"
 	>
 	<div class="generalModel_btn">
 		<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
@@ -23,7 +24,7 @@
 		</div>
 		<div class="habitSetStyle_content_bottom">
 			<div class="content_bottom_item" v-for="item in styleList">
-				<div class="content_bottom_item_border" :class="{active:item.id == selectStyleId}" @click="setItemSelect(item)">
+				<div class="content_bottom_item_border" :class="{active:item.name == selectStyle.name}" @click="setItemSelect(item)">
 					{{ item.name}}
 				</div>
 			</div>
@@ -56,7 +57,11 @@ setup(props,{emit}) {
 	let habitSetStyleMask:any = ref(false)//弹窗遮罩
 	let habitSetStyleData:any = reactive({
 		styleList:[],
-		selectStyleId:'',
+		selectStyle:{
+			name:'',
+			id:'',
+		},
+		selectStyleName:'',
 		isShowMark:false,
 	})
 	let getStyleList = ()=>{
@@ -75,11 +80,13 @@ setup(props,{emit}) {
 			habitSetStyleData.isShowMark = false
 		});
 	}
-	let init = ()=>{
+	let init = (data:any)=>{
 		habitSetStyle.value = true
 		if(habitSetStyleData.styleList.length == 0){
 			getStyleList()
 		}
+		habitSetStyleData.selectStyle.id = data.styleId 
+		habitSetStyleData.selectStyle.name = data.styleName 
 		// habitSetStyleData.selectStyleId = 'feng2'
 	}
 	let setCover = (item:any)=>{
@@ -90,7 +97,7 @@ setup(props,{emit}) {
 	let cleardata = ()=>{
 		habitSetStyle.value = false
 		habitSetStyleData.isShowMark = false
-		setParentData()
+		// setParentData()
 	
 	}
 	let setParentData = ()=>{
@@ -101,11 +108,11 @@ setup(props,{emit}) {
 		cleardata()
 	}
 	let setOk= ()=>{
-		emit('setWorkspaceStyle',habitSetStyleData.selectStyleId)
+		emit('setWorkspaceStyle',habitSetStyleData.selectStyle.id)
 		cleardata()
 	}
 	let setItemSelect = (item:any)=>{
-		habitSetStyleData.selectStyleId = item.id
+		habitSetStyleData.selectStyle = item
 	}
 	return {
 		habitSetStyle,
@@ -161,6 +168,12 @@ methods: {
 
 <style lang="less">
 .habitSetStyle_modal {
+	&.generalModel{
+		.ant-modal-body {
+			height: calc(55rem*1.2);
+		}
+	}
+	
 	.habitSetStyle_content{
 		display: flex;
 		flex-direction: column;