Merge branch 'next' into feat-tag
This commit is contained in:
sight
commit
2631e24207
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,6 +2,7 @@
|
||||
node_modules/
|
||||
package-lock.json
|
||||
package/document/dist/
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.vscode
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@layui/layui-vue",
|
||||
"version": "1.3.13",
|
||||
"version": "1.3.14",
|
||||
"author": "就眠儀式",
|
||||
"license": "MIT",
|
||||
"description": "a component library for Vue 3 base on layui-vue",
|
||||
|
||||
@ -169,7 +169,6 @@ onMounted(() => {
|
||||
|
||||
.layui-notice-bar {
|
||||
padding: 0 15px;
|
||||
width: 100%;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.layui-notice-bar .layui-notice-bar-warp {
|
||||
@ -186,6 +185,7 @@ onMounted(() => {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.layui-notice-bar
|
||||
.layui-notice-bar-warp
|
||||
.layui-notice-bar-warp-text-box
|
||||
|
||||
@ -24,6 +24,7 @@ import LayDropdown from "../dropdown/index.vue";
|
||||
import LayPage from "../page/index.vue";
|
||||
import LayEmpty from "../empty/index.vue";
|
||||
import TableRow from "./TableRow.vue";
|
||||
import { nextTick } from "vue";
|
||||
|
||||
export interface LayTableProps {
|
||||
id?: string;
|
||||
@ -88,6 +89,7 @@ const allChecked = ref(false);
|
||||
const hasChecked = ref(false);
|
||||
const tableDataSource = ref<any[]>([...props.dataSource]);
|
||||
const tableColumns = ref([...props.columns]);
|
||||
|
||||
const tableColumnKeys = ref(
|
||||
props.columns.map((item: any) => {
|
||||
if (item.hide != true) {
|
||||
@ -128,6 +130,9 @@ watch(
|
||||
() => props.dataSource,
|
||||
() => {
|
||||
tableDataSource.value = [...props.dataSource];
|
||||
nextTick(() => {
|
||||
getScrollWidth();
|
||||
});
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
@ -270,8 +275,8 @@ const sortTable = (e: any, key: string, sort: string) => {
|
||||
}
|
||||
};
|
||||
|
||||
let tableHeader = ref<HTMLElement | null>(null);
|
||||
let tableBody = ref<HTMLElement | null>(null);
|
||||
let tableHeader = ref<HTMLElement | null>(null);
|
||||
let scrollWidthCell = ref(0);
|
||||
|
||||
const getScrollWidth = () => {
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
::: demo
|
||||
|
||||
<template>
|
||||
<lay-notice-bar text="以写作为工具，为道途，先帮助自己一程，再以自己的领悟帮助他人一程, 这是一种服务 。" mode="link"></lay-notice-bar>
|
||||
<lay-notice-bar text="以创造性的行为实践于人世。若能以写作为工具，为道途，先帮助自己一程，再以领悟帮助他人一程。这是一种服务。" mode="link"></lay-notice-bar>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@ -34,7 +34,7 @@ export default {
|
||||
::: demo
|
||||
|
||||
<template>
|
||||
<lay-notice-bar leftIcon="layui-icon-mute" text="最好的爱是两个人彼此做个伴，不要束缚，不要缠绕，不要占有，不渴望从对方那里得到，只是并肩站在一起，看看这个世界。"></lay-notice-bar>
|
||||
<lay-notice-bar leftIcon="layui-icon-mute" text="以一颗冷静思辨的态度去看待这个物质浮躁的新时代，大环境，恰当处理自身与外界环境的矛盾，如何身心健康，自在的成为自己。"></lay-notice-bar>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@ -55,7 +55,7 @@ export default {
|
||||
::: demo
|
||||
|
||||
<template>
|
||||
<lay-notice-bar leftIcon="layui-icon-mute" rightIcon="layui-icon-close" text="所有发生过的都是既定的。是应该发生。只能发生。" mode="closeable" background="#ecf5ff" ></lay-notice-bar>
|
||||
<lay-notice-bar leftIcon="layui-icon-mute" rightIcon="layui-icon-close" text="事情总是会自动变化。顺其自然就好。" mode="closeable" background="#ecf5ff" ></lay-notice-bar>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
@ -1278,7 +1278,7 @@ export default {
|
||||
::: table
|
||||
|
||||
| 属性 | 描述 | 类型 | 默认值 | 可选值 |
|
||||
| -------------------- | ----------------------------- | --------- | ------- | -------------- |
|
||||
| -------------------- | ----------------------------------------------------- | ------------------- | ---------- | ------------------ |
|
||||
| columns | 列配置 - [更多](#tableColumn) | -- | -- | -- |
|
||||
| dataSource | 数据源 | -- | -- | -- |
|
||||
| checkbox | 开启复选框 | `boolean` | `false` | `true` `false` |
|
||||
@ -1287,7 +1287,7 @@ export default {
|
||||
| v-model:selectedKey | 选中项 (单选) | -- | -- | -- |
|
||||
| default-toolbar | 工具栏 | `boolean` | `false` | `true` `false` |
|
||||
| size | 尺寸 | `string` | `md` | `lg` `md` `sm` |
|
||||
| children-column-name | 树节点字段 | `string` | `children`| -- |
|
||||
| children-column-name | 树节点字段 | `string` | `children` | -- |
|
||||
| indent-size | 树表行级缩进 | `number` | `30` | -- |
|
||||
| height | 表格高度 | `number` | -- | -- |
|
||||
| maxHeight | 表格最大高度 | `number` | -- | -- |
|
||||
@ -1336,7 +1336,7 @@ export default {
|
||||
::: table
|
||||
|
||||
| 插槽 | 描述 | 类型 | 默认值 | 可选值 |
|
||||
| --------------- | ------------------------------ | --------- | ------- | ---------------------------- |
|
||||
| --------------- | ------------------------------ | --------- | ------- | --------------------------- |
|
||||
| title | 列标题 | -- | -- | -- |
|
||||
| key | 数据字段 | -- | -- | -- |
|
||||
| customSlot | 自定义插槽 | -- | -- | -- |
|
||||
|
||||
@ -11,6 +11,16 @@
|
||||
<template>
|
||||
<lay-timeline>
|
||||
<lay-timeline-item title="1.3.x">
|
||||
<ul>
|
||||
<a name="1-3-14"></a>
|
||||
<li>
|
||||
<h3>1.3.14 <span class="layui-badge-rim">2022-08-06</span></h3>
|
||||
<ul>
|
||||
<li>[修复] button 组件 hover 状态无效果的问题。</li>
|
||||
<li>[修复] table 组件 data-source 远程加载后 scroll 计算错误。 </li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<ul>
|
||||
<a name="1-3-13"></a>
|
||||
<li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user