Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
啊嘞嘞EC
vue-vben-admin
提交
da76f3c7
V
vue-vben-admin
项目概览
啊嘞嘞EC
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
da76f3c7
编写于
1月 04, 2021
作者:
V
vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(layout): fix layout scale error
上级
7a07b703
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
58 addition
and
21 deletion
+58
-21
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+2
-0
src/components/Basic/index.ts
src/components/Basic/index.ts
+3
-2
src/components/Description/index.ts
src/components/Description/index.ts
+5
-2
src/components/Menu/index.ts
src/components/Menu/index.ts
+5
-1
src/components/Menu/src/useOpenKeys.ts
src/components/Menu/src/useOpenKeys.ts
+1
-2
src/components/Table/src/components/editable/EditableCell.vue
...components/Table/src/components/editable/EditableCell.vue
+6
-0
src/components/Table/src/hooks/useDataSource.ts
src/components/Table/src/hooks/useDataSource.ts
+16
-5
src/components/Table/src/hooks/useLoading.ts
src/components/Table/src/hooks/useLoading.ts
+7
-4
src/components/Table/src/hooks/useTableScroll.ts
src/components/Table/src/hooks/useTableScroll.ts
+10
-4
src/layouts/default/header/MultipleHeader.vue
src/layouts/default/header/MultipleHeader.vue
+2
-1
src/layouts/default/tabs/useTabDropdown.ts
src/layouts/default/tabs/useTabDropdown.ts
+1
-0
未找到文件。
CHANGELOG.zh_CN.md
浏览文件 @
da76f3c7
...
...
@@ -10,6 +10,8 @@
-
修复表格列配置已知问题
-
恢复 table 的
`isTreeTable`
属性
-
修复表格内存溢出问题
-
修复
`layout`
收缩展开功能在分割模式下失效
## 2.0.0-rc.15 (2020-12-31)
...
...
src/components/Basic/index.ts
浏览文件 @
da76f3c7
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
import
BasicArrow
from
'
./src/BasicArrow.vue
'
;
import
BasicTitle
from
'
./src/BasicTitle.vue
'
;
export
{
BasicArrow
};
export
{
BasicArrow
,
BasicTitle
};
// export const BasicArrow = createAsyncComponent(() => import('./src/BasicArrow.vue'));
export
const
BasicHelp
=
createAsyncComponent
(()
=>
import
(
'
./src/BasicHelp.vue
'
));
export
const
BasicTitle
=
createAsyncComponent
(()
=>
import
(
'
./src/BasicTitle.vue
'
));
//
export const BasicTitle = createAsyncComponent(() => import('./src/BasicTitle.vue'));
src/components/Description/index.ts
浏览文件 @
da76f3c7
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
export
const
Description
=
createAsyncComponent
(()
=>
import
(
'
./src/index
'
));
//
import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
//
export const Description = createAsyncComponent(() => import('./src/index'));
import
Description
from
'
./src/index
'
;
export
{
Description
};
export
*
from
'
./src/types
'
;
export
{
useDescription
}
from
'
./src/useDescription
'
;
src/components/Menu/index.ts
浏览文件 @
da76f3c7
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
export
const
BasicMenu
=
createAsyncComponent
(()
=>
import
(
'
./src/BasicMenu.vue
'
));
import
BasicMenu
from
'
./src/BasicMenu.vue
'
;
// export const BasicMenu = createAsyncComponent(() => import('./src/BasicMenu.vue'));
export
const
MenuTag
=
createAsyncComponent
(()
=>
import
(
'
./src/components/MenuItemTag.vue
'
));
export
{
BasicMenu
};
src/components/Menu/src/useOpenKeys.ts
浏览文件 @
da76f3c7
...
...
@@ -23,7 +23,6 @@ export function useOpenKeys(
return
;
}
const
native
=
unref
(
getIsMixSidebar
)
&&
unref
(
getMixSideFixed
);
useTimeoutFn
(
()
=>
{
const
menuList
=
toRaw
(
menus
.
value
);
...
...
@@ -37,7 +36,7 @@ export function useOpenKeys(
}
},
16
,
native
!
native
);
}
...
...
src/components/Table/src/components/editable/EditableCell.vue
浏览文件 @
da76f3c7
...
...
@@ -148,10 +148,16 @@
});
watchEffect
(()
=>
{
console
.
log
(
'
======================
'
);
console
.
log
(
1
);
console
.
log
(
'
======================
'
);
defaultValueRef
.
value
=
props
.
value
;
});
watchEffect
(()
=>
{
console
.
log
(
'
======================
'
);
console
.
log
(
2
);
console
.
log
(
'
======================
'
);
const
{
editable
}
=
props
.
column
;
if
(
isBoolean
(
editable
)
||
isBoolean
(
unref
(
getRowEditable
)))
{
isEdit
.
value
=
!!
editable
||
unref
(
getRowEditable
);
...
...
src/components/Table/src/hooks/useDataSource.ts
浏览文件 @
da76f3c7
import
type
{
BasicTableProps
,
FetchParams
,
SorterResult
}
from
'
../types/table
'
;
import
type
{
PaginationProps
}
from
'
../types/pagination
'
;
import
{
ref
,
unref
,
ComputedRef
,
computed
,
onMounted
,
watch
Effect
,
reactive
}
from
'
vue
'
;
import
{
ref
,
unref
,
ComputedRef
,
computed
,
onMounted
,
watch
,
reactive
}
from
'
vue
'
;
import
{
useTimeoutFn
}
from
'
/@/hooks/core/useTimeout
'
;
...
...
@@ -40,10 +40,21 @@ export function useDataSource(
});
const
dataSourceRef
=
ref
<
Recordable
[]
>
([]);
watchEffect
(()
=>
{
const
{
dataSource
,
api
}
=
unref
(
propsRef
);
!
api
&&
dataSource
&&
(
dataSourceRef
.
value
=
dataSource
);
});
// watchEffect(() => {
// const { dataSource, api } = unref(propsRef);
// !api && dataSource && (dataSourceRef.value = dataSource);
// });
watch
(
()
=>
unref
(
propsRef
).
dataSource
,
()
=>
{
const
{
dataSource
,
api
}
=
unref
(
propsRef
);
!
api
&&
dataSource
&&
(
dataSourceRef
.
value
=
dataSource
);
},
{
immediate
:
true
,
}
);
function
handleTableChange
(
pagination
:
PaginationProps
,
...
...
src/components/Table/src/hooks/useLoading.ts
浏览文件 @
da76f3c7
import
{
ref
,
ComputedRef
,
unref
,
computed
,
watch
Effect
}
from
'
vue
'
;
import
{
ref
,
ComputedRef
,
unref
,
computed
,
watch
}
from
'
vue
'
;
import
type
{
BasicTableProps
}
from
'
../types/table
'
;
export
function
useLoading
(
props
:
ComputedRef
<
BasicTableProps
>
)
{
const
loadingRef
=
ref
(
unref
(
props
).
loading
);
watchEffect
(()
=>
{
loadingRef
.
value
=
unref
(
props
).
loading
;
});
watch
(
()
=>
unref
(
props
).
loading
,
(
loading
)
=>
{
loadingRef
.
value
=
loading
;
}
);
const
getLoading
=
computed
(()
=>
{
return
unref
(
loadingRef
);
...
...
src/components/Table/src/hooks/useTableScroll.ts
浏览文件 @
da76f3c7
import
type
{
BasicTableProps
,
TableRowSelection
}
from
'
../types/table
'
;
import
type
{
Ref
,
ComputedRef
}
from
'
vue
'
;
import
{
computed
,
unref
,
ref
,
nextTick
,
watch
Effect
}
from
'
vue
'
;
import
{
computed
,
unref
,
ref
,
nextTick
,
watch
}
from
'
vue
'
;
import
{
getViewportOffset
}
from
'
/@/utils/domUtils
'
;
import
{
isBoolean
}
from
'
/@/utils/is
'
;
...
...
@@ -28,9 +28,15 @@ export function useTableScroll(
return
canResize
&&
!
(
scroll
||
{}).
y
;
});
watchEffect
(()
=>
{
unref
(
getCanResize
)
&&
debounceRedoHeight
();
});
watch
(
()
=>
unref
(
getCanResize
),
()
=>
{
debounceRedoHeight
();
},
{
immediate
:
true
,
}
);
function
redoHeight
()
{
if
(
unref
(
getCanResize
))
{
...
...
src/layouts/default/header/MultipleHeader.vue
浏览文件 @
da76f3c7
...
...
@@ -34,6 +34,7 @@
getShowInsetHeaderRef
,
getShowFullHeaderRef
,
getHeaderTheme
,
getShowHeader
,
}
=
useHeaderSetting
();
const
{
getFullContent
}
=
useFullContent
();
...
...
@@ -68,7 +69,7 @@
const
getPlaceholderDomStyle
=
computed
(
():
CSSProperties
=>
{
let
height
=
0
;
if
(
unref
(
getShowFullHeaderRef
)
||
!
unref
(
getSplit
))
{
if
(
(
unref
(
getShowFullHeaderRef
)
||
!
unref
(
getSplit
))
&&
unref
(
getShowHeader
))
{
height
+=
HEADER_HEIGHT
;
}
if
(
unref
(
getShowMultipleTab
))
{
...
...
src/layouts/default/tabs/useTabDropdown.ts
浏览文件 @
da76f3c7
...
...
@@ -129,6 +129,7 @@ export function useTabDropdown(tabContentProps: TabContentProps) {
const
isScale
=
!
unref
(
getShowMenu
)
&&
!
unref
(
getShowHeader
);
setMenuSetting
({
show
:
isScale
,
hidden
:
!
isScale
,
});
setHeaderSetting
({
show
:
isScale
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录