Merge branch 'develop' of https://gitee.com/layui-vue/layui-vue into develop
This commit is contained in:
commit
638b3cf93b
@ -17,9 +17,12 @@
|
||||
<h3>0.4.4 <span class="layui-badge-rim">2022-03-29</span></h3>
|
||||
<ul>
|
||||
<li>[新增] tab 组件 position 属性, 不同方向的选项卡标题。</li>
|
||||
<li>[修复] variable 全局变量重复导入的问题</li>
|
||||
<li>[修复] transfer 组件 showSearch 属性类型警告。</li>
|
||||
<li>[修复] upload 组件 number 属性必填警告。</li>
|
||||
<li>[修复] variable 全局变量重复导入的问题。</li>
|
||||
<li>[修复] menu 组件 openKeys 属性失效。</li>
|
||||
<li>[支持] icon 列表复制。</li>
|
||||
<li>[支持] 夜间模式</li>
|
||||
<li>[支持] 夜间模式。</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
@ -81,7 +81,7 @@ app.mount('#app')
|
||||
::: describe 根据不同的 CDN 提供商有不同的引入方式, 根据不同的 CDN 提供商有不同的引入方式, 我们在这里以 unpkg 举例。
|
||||
:::
|
||||
|
||||
```
|
||||
```html
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
|
@ -204,16 +204,16 @@ const throttle = (func: Function, wait: number) => {
|
||||
list-style: none;
|
||||
&:hover {
|
||||
background-color: #f6f6f6 !important;
|
||||
color: #5fb878;
|
||||
color: var(--global-checked-color);
|
||||
}
|
||||
&:active {
|
||||
background-color: #f6f6f6 !important;
|
||||
color: #89d89f;
|
||||
color: var(--global-checked-color);
|
||||
}
|
||||
&.active {
|
||||
background-color: #f6f6f6 !important;
|
||||
* {
|
||||
color: #5fb878 !important;
|
||||
color: var(--global-checked-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@layui/layui-vue",
|
||||
"version": "0.4.5-alpha.2",
|
||||
"version": "0.4.5-alpha.5",
|
||||
"author": "就眠儀式",
|
||||
"license": "MIT",
|
||||
"description": "a component library for Vue 3 base on layui-vue",
|
||||
|
@ -1,19 +1,17 @@
|
||||
@import (reference) "../../theme/variable.less";
|
||||
|
||||
@card-border-radius: var(--card-border-radius);
|
||||
@card-back-color: var(--card-back-color);
|
||||
@card-fore-color: var(--card-fore-color);
|
||||
|
||||
:root {
|
||||
--card-border-radius: @global-border-radius;
|
||||
--card-back-color: @global-back-color;
|
||||
--card-fore-color: @global-fore-color;
|
||||
}
|
||||
|
||||
.layui-card {
|
||||
margin-bottom: 15px;
|
||||
border-radius: @card-border-radius;
|
||||
background-color: @card-back-color;
|
||||
background-color: #ffffff;
|
||||
.layui-card-header {
|
||||
height: 42px;
|
||||
line-height: 42px;
|
||||
|
@ -32,11 +32,11 @@ const props = withDefaults(defineProps<LayMenuProps>(), {
|
||||
collapseTransition: true,
|
||||
});
|
||||
|
||||
let oldOpenKeys = ref<string[]>([]);
|
||||
|
||||
const isTree = computed(() => props.tree);
|
||||
const isCollapse = computed(() => props.collapse);
|
||||
const isCollapseTransition = computed(() => props.collapseTransition);
|
||||
let oldOpenKeys = ref<string[]>(props.openKeys);
|
||||
|
||||
const openKeys = computed({
|
||||
get() {
|
||||
@ -67,8 +67,7 @@ watch(
|
||||
// 赋值所有打开
|
||||
emit("update:openKeys", oldOpenKeys.value);
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
}, { immediate: true }
|
||||
);
|
||||
|
||||
provide("isTree", isTree);
|
||||
|
@ -23,16 +23,13 @@ export interface LaySubMenuProps {
|
||||
}
|
||||
|
||||
const slots = useSlots();
|
||||
|
||||
const props = defineProps<LaySubMenuProps>();
|
||||
|
||||
const isTree: Ref<boolean> = inject("isTree") as Ref<boolean>;
|
||||
const selectedKey: Ref<string> = inject("selectedKey") as Ref<string>;
|
||||
const openKeys: Ref<string[]> = inject("openKeys") as Ref<string[]>;
|
||||
const isCollapse: Ref<boolean> = inject("isCollapse") as Ref<boolean>;
|
||||
const isCollapseTransition: Ref<boolean> = inject(
|
||||
"isCollapseTransition"
|
||||
) as Ref<boolean>;
|
||||
const isCollapseTransition: Ref<boolean> = inject("isCollapseTransition") as Ref<boolean>;
|
||||
|
||||
const isOpen = computed(() => {
|
||||
return openKeys.value.includes(props.id);
|
||||
|
@ -41,6 +41,7 @@ const emit = defineEmits([
|
||||
"change",
|
||||
"row-double",
|
||||
"update:selectedKeys",
|
||||
"contextmenu",
|
||||
]);
|
||||
|
||||
const slot = useSlots();
|
||||
|
@ -8,12 +8,12 @@ export default {
|
||||
import "./index.less";
|
||||
import LayScroll from "../scroll";
|
||||
import { Ref, ref, useSlots, watch } from "vue";
|
||||
import { Recordable } from "../../types";
|
||||
import { BooleanOrString, Recordable } from "../../types";
|
||||
|
||||
export interface LayTransferProps {
|
||||
id?: string;
|
||||
title?: string[];
|
||||
showSearch?: boolean;
|
||||
showSearch?: BooleanOrString;
|
||||
dataSource: Recordable[];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user