✨(component): 优化 date-picker 组件样式
This commit is contained in:
		
							parent
							
								
									49fcb42d9e
								
							
						
					
					
						commit
						78b2189974
					
				@ -512,8 +512,7 @@ html #layuicss-laydate {
 | 
			
		||||
  line-height: 71px;
 | 
			
		||||
}
 | 
			
		||||
.laydate-range-hover{
 | 
			
		||||
  background-color: var(--global-checked-color) !important;
 | 
			
		||||
  color: white !important;
 | 
			
		||||
  background-color: var(--global-neutral-color-2) !important;
 | 
			
		||||
}
 | 
			
		||||
.layui-laydate-content .layui-disabled:hover{
 | 
			
		||||
  background-color: transparent !important;
 | 
			
		||||
 | 
			
		||||
@ -57,6 +57,10 @@
 | 
			
		||||
  font-weight: 700;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.layui-select-content .layui-select-option .layui-checkbox{
 | 
			
		||||
  margin-right: 10px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.layui-select-search {
 | 
			
		||||
  padding: 5px 10px;
 | 
			
		||||
}
 | 
			
		||||
@ -100,7 +100,6 @@ function handleRowClick(node: TreeData) {
 | 
			
		||||
 | 
			
		||||
//判断是否半选
 | 
			
		||||
const isChildAllSelected = computed(() => {
 | 
			
		||||
 | 
			
		||||
  function _isChildAllSelected(node: TreeData): boolean {
 | 
			
		||||
    if (!props.showCheckbox) {
 | 
			
		||||
      return false;
 | 
			
		||||
@ -124,7 +123,7 @@ const isChildAllSelected = computed(() => {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return function (node: TreeData): boolean {
 | 
			
		||||
    if(props.checkStrictly) {
 | 
			
		||||
    if (props.checkStrictly) {
 | 
			
		||||
      return false;
 | 
			
		||||
    } else {
 | 
			
		||||
      let res = _isChildAllSelected(node);
 | 
			
		||||
@ -157,7 +156,7 @@ const isChildAllSelected = computed(() => {
 | 
			
		||||
            @click.stop="handleIconClick(node)"
 | 
			
		||||
          />
 | 
			
		||||
        </span>
 | 
			
		||||
        <lay-checkbox          
 | 
			
		||||
        <lay-checkbox
 | 
			
		||||
          value="miss"
 | 
			
		||||
          skin="primary"
 | 
			
		||||
          :modelValue="node.isChecked"
 | 
			
		||||
 | 
			
		||||
@ -23,7 +23,7 @@ export const useTree: UseTree = (props: TreeProps, emit: TreeEmits) => {
 | 
			
		||||
      showCheckbox: props.showCheckbox ?? false,
 | 
			
		||||
      checkedKeys: props.checkedKeys ?? [],
 | 
			
		||||
      expandKeys: props.expandKeys ?? [],
 | 
			
		||||
      checkStrictly: props.checkStrictly ?? false
 | 
			
		||||
      checkStrictly: props.checkStrictly ?? false,
 | 
			
		||||
    },
 | 
			
		||||
    props.data
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
@ -1,34 +1,34 @@
 | 
			
		||||
export function getNode(root: any, id: string) {
 | 
			
		||||
	let resultNode = null;
 | 
			
		||||
	findNode(root, id);
 | 
			
		||||
	function findNode(root: any, id: string){
 | 
			
		||||
		if(!!root) {
 | 
			
		||||
			let type = Object.prototype.toString.call(root);
 | 
			
		||||
			if(type === '[object Object]') {
 | 
			
		||||
				if(root.id && root.id === id) {
 | 
			
		||||
					resultNode = root
 | 
			
		||||
				} else {
 | 
			
		||||
					let node = root.children || null
 | 
			
		||||
					findNode(node, id);
 | 
			
		||||
				}
 | 
			
		||||
			}else if(type === '[object Array]') {
 | 
			
		||||
				let needNode = root.find((i:any) => !!i === true && i.id === id);
 | 
			
		||||
				if(!!needNode) {
 | 
			
		||||
					resultNode = needNode;
 | 
			
		||||
				} else {
 | 
			
		||||
					if(root.length) {
 | 
			
		||||
						root.forEach((item: any)=>{
 | 
			
		||||
							if(item && item.children) {
 | 
			
		||||
								let node = item.children
 | 
			
		||||
								if(node && node.length){
 | 
			
		||||
									findNode(node, id);
 | 
			
		||||
								}
 | 
			
		||||
							}
 | 
			
		||||
						})
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return resultNode;
 | 
			
		||||
}
 | 
			
		||||
  let resultNode = null;
 | 
			
		||||
  findNode(root, id);
 | 
			
		||||
  function findNode(root: any, id: string) {
 | 
			
		||||
    if (!!root) {
 | 
			
		||||
      let type = Object.prototype.toString.call(root);
 | 
			
		||||
      if (type === "[object Object]") {
 | 
			
		||||
        if (root.id && root.id === id) {
 | 
			
		||||
          resultNode = root;
 | 
			
		||||
        } else {
 | 
			
		||||
          let node = root.children || null;
 | 
			
		||||
          findNode(node, id);
 | 
			
		||||
        }
 | 
			
		||||
      } else if (type === "[object Array]") {
 | 
			
		||||
        let needNode = root.find((i: any) => !!i === true && i.id === id);
 | 
			
		||||
        if (!!needNode) {
 | 
			
		||||
          resultNode = needNode;
 | 
			
		||||
        } else {
 | 
			
		||||
          if (root.length) {
 | 
			
		||||
            root.forEach((item: any) => {
 | 
			
		||||
              if (item && item.children) {
 | 
			
		||||
                let node = item.children;
 | 
			
		||||
                if (node && node.length) {
 | 
			
		||||
                  findNode(node, id);
 | 
			
		||||
                }
 | 
			
		||||
              }
 | 
			
		||||
            });
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  return resultNode;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -21,6 +21,7 @@
 | 
			
		||||
          <li>[修复] tree 组件 node 配置 disabled 启用时, @node-click 事件仍触发的问题。</li>
 | 
			
		||||
          <li>[修复] checkbox 组件 label 属性与 default 插槽不设置, layui-checkbox-label 元素仍存在的问题。</li>
 | 
			
		||||
          <li>[修复] tree 组件 show-checkbox 为 true 时, 复选框与标题间距过宽的问题。</li>
 | 
			
		||||
          <li>[调整] date-picker 组件 laydate-range-hover 前景色与背景色。</li>
 | 
			
		||||
        </ul> 
 | 
			
		||||
      </li>
 | 
			
		||||
    </ul>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user