fix: 修复下拉菜单嵌套下拉菜单包裹问题
This commit is contained in:
		
							parent
							
								
									8f21f8e132
								
							
						
					
					
						commit
						1538585214
					
				@ -139,11 +139,10 @@ onMounted(() => {
 | 
				
			|||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
watch([red, green, blue], (newValue) => {
 | 
					watch([red, green, blue], (newValue) => {
 | 
				
			||||||
  
 | 
					  emit(
 | 
				
			||||||
  emit("update:modelValue", rgba2hex(red.value,
 | 
					    "update:modelValue",
 | 
				
			||||||
    green.value,
 | 
					    rgba2hex(red.value, green.value, blue.value, alpha.value)
 | 
				
			||||||
    blue.value,
 | 
					  );
 | 
				
			||||||
    alpha.value));
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let { h, s, v } = rgb2hsv(red.value, green.value, blue.value);
 | 
					  let { h, s, v } = rgb2hsv(red.value, green.value, blue.value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -158,10 +157,10 @@ watch([red, green, blue], (newValue) => {
 | 
				
			|||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
watch(alpha, () => {
 | 
					watch(alpha, () => {
 | 
				
			||||||
  emit("update:modelValue", rgba2hex(red.value,
 | 
					  emit(
 | 
				
			||||||
    green.value,
 | 
					    "update:modelValue",
 | 
				
			||||||
    blue.value,
 | 
					    rgba2hex(red.value, green.value, blue.value, alpha.value)
 | 
				
			||||||
    alpha.value));
 | 
					  );
 | 
				
			||||||
  // 移动透明度滑块
 | 
					  // 移动透明度滑块
 | 
				
			||||||
  alphaSliderStyle.value = `left: ${
 | 
					  alphaSliderStyle.value = `left: ${
 | 
				
			||||||
    alpha.value >= 1 ? "calc(100% - 6px)" : alpha.value * 100 + "%"
 | 
					    alpha.value >= 1 ? "calc(100% - 6px)" : alpha.value * 100 + "%"
 | 
				
			||||||
@ -347,7 +346,9 @@ function parseColor(color: any) {
 | 
				
			|||||||
    let r, g, b, a;
 | 
					    let r, g, b, a;
 | 
				
			||||||
    if (typeof color === "string") {
 | 
					    if (typeof color === "string") {
 | 
				
			||||||
      if (
 | 
					      if (
 | 
				
			||||||
        /^#?([0-9a-fA-F]{6}|[0-9a-fA-F]{8}|[0-9a-fA-F]{3}|[0-9a-fA-F]{4})$/.test(color)
 | 
					        /^#?([0-9a-fA-F]{6}|[0-9a-fA-F]{8}|[0-9a-fA-F]{3}|[0-9a-fA-F]{4})$/.test(
 | 
				
			||||||
 | 
					          color
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
      ) {
 | 
					      ) {
 | 
				
			||||||
        return hex2rgba(color);
 | 
					        return hex2rgba(color);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
				
			|||||||
@ -1923,10 +1923,11 @@ a cite {
 | 
				
			|||||||
  display: none;
 | 
					  display: none;
 | 
				
			||||||
  position: absolute;
 | 
					  position: absolute;
 | 
				
			||||||
  left: 0;
 | 
					  left: 0;
 | 
				
			||||||
 | 
					  margin-top: 2px;
 | 
				
			||||||
  z-index: 899;
 | 
					  z-index: 899;
 | 
				
			||||||
  min-width: 100%;
 | 
					  min-width: 100%;
 | 
				
			||||||
  //max-height: 360px;
 | 
					  //max-height: 360px;
 | 
				
			||||||
  overflow-y: auto;
 | 
					  //overflow-y: auto;
 | 
				
			||||||
  background-color: #fff;
 | 
					  background-color: #fff;
 | 
				
			||||||
  box-sizing: border-box;
 | 
					  box-sizing: border-box;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user