Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Dr.Disrespect
vue-vben-admin
提交
1293a738
V
vue-vben-admin
项目概览
Dr.Disrespect
/
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,发现更多精彩内容 >>
提交
1293a738
编写于
12月 13, 2020
作者:
V
vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: fix modal and drawer component missing uid
上级
f7ec3c93
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
14 addition
and
8 deletion
+14
-8
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
src/components/Application/index.ts
src/components/Application/index.ts
+3
-1
src/components/Drawer/src/useDrawer.ts
src/components/Drawer/src/useDrawer.ts
+1
-1
src/components/Modal/src/useModal.ts
src/components/Modal/src/useModal.ts
+4
-2
src/layouts/default/header/LayoutMultipleHeader.less
src/layouts/default/header/LayoutMultipleHeader.less
+3
-2
src/layouts/default/index.less
src/layouts/default/index.less
+1
-1
src/layouts/default/sider/index.less
src/layouts/default/sider/index.less
+1
-1
未找到文件。
CHANGELOG.zh_CN.md
浏览文件 @
1293a738
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
-
修复 axios 大小写问题
-
修复 axios 大小写问题
-
修复按钮样式问题
-
修复按钮样式问题
-
修复菜单分割模式问题
-
修复菜单分割模式问题
-
修复
`Modal`
与
`Drawer`
组件在使用 emits 数据传递失效问题
## 2.0.0-rc.13 (2020-12-10)
## 2.0.0-rc.13 (2020-12-10)
...
...
src/components/Application/index.ts
浏览文件 @
1293a738
import
{
withInstall
}
from
'
../util
'
;
import
{
withInstall
}
from
'
../util
'
;
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
import
AppLogo
from
'
./src/AppLogo.vue
'
;
export
const
AppLocalePicker
=
createAsyncComponent
(()
=>
import
(
'
./src/AppLocalePicker.vue
'
),
{
export
const
AppLocalePicker
=
createAsyncComponent
(()
=>
import
(
'
./src/AppLocalePicker.vue
'
),
{
loading
:
true
,
loading
:
true
,
...
@@ -8,8 +9,9 @@ export const AppProvider = createAsyncComponent(() => import('./src/AppProvider.
...
@@ -8,8 +9,9 @@ export const AppProvider = createAsyncComponent(() => import('./src/AppProvider.
export
const
AppSearch
=
createAsyncComponent
(()
=>
import
(
'
./src/search/AppSearch.vue
'
),
{
export
const
AppSearch
=
createAsyncComponent
(()
=>
import
(
'
./src/search/AppSearch.vue
'
),
{
loading
:
true
,
loading
:
true
,
});
});
export
const
AppLogo
=
createAsyncComponent
(()
=>
import
(
'
./src/AppLogo.vue
'
));
//
export const AppLogo = createAsyncComponent(() => import('./src/AppLogo.vue'));
withInstall
(
AppLocalePicker
,
AppLogo
,
AppProvider
,
AppSearch
);
withInstall
(
AppLocalePicker
,
AppLogo
,
AppProvider
,
AppSearch
);
export
{
useAppProviderContext
}
from
'
./src/useAppContext
'
;
export
{
useAppProviderContext
}
from
'
./src/useAppContext
'
;
export
{
AppLogo
};
src/components/Drawer/src/useDrawer.ts
浏览文件 @
1293a738
...
@@ -102,7 +102,7 @@ export const useDrawerInner = (callbackFn?: Fn): UseDrawerInnerReturnType => {
...
@@ -102,7 +102,7 @@ export const useDrawerInner = (callbackFn?: Fn): UseDrawerInnerReturnType => {
uidRef
.
value
=
uuid
;
uidRef
.
value
=
uuid
;
drawerInstanceRef
.
value
=
modalInstance
;
drawerInstanceRef
.
value
=
modalInstance
;
currentInstall
.
emit
(
'
register
'
,
modalInstance
);
currentInstall
.
emit
(
'
register
'
,
modalInstance
,
uuid
);
};
};
watchEffect
(()
=>
{
watchEffect
(()
=>
{
...
...
src/components/Modal/src/useModal.ts
浏览文件 @
1293a738
...
@@ -90,6 +90,9 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
...
@@ -90,6 +90,9 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
throw
new
Error
(
'
instance is undefined!
'
);
throw
new
Error
(
'
instance is undefined!
'
);
}
}
// currentInstall.type.emits = [...currentInstall.type.emits, 'register'];
// Object.assign(currentInstall.type.emits, ['register']);
const
getInstance
=
()
=>
{
const
getInstance
=
()
=>
{
const
instance
=
unref
(
modalInstanceRef
);
const
instance
=
unref
(
modalInstanceRef
);
if
(
!
instance
)
{
if
(
!
instance
)
{
...
@@ -103,10 +106,9 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
...
@@ -103,10 +106,9 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
tryOnUnmounted
(()
=>
{
tryOnUnmounted
(()
=>
{
modalInstanceRef
.
value
=
null
;
modalInstanceRef
.
value
=
null
;
});
});
uidRef
.
value
=
uuid
;
uidRef
.
value
=
uuid
;
modalInstanceRef
.
value
=
modalInstance
;
modalInstanceRef
.
value
=
modalInstance
;
currentInstall
.
emit
(
'
register
'
,
modalInstance
);
currentInstall
.
emit
(
'
register
'
,
modalInstance
,
uuid
);
};
};
watchEffect
(()
=>
{
watchEffect
(()
=>
{
...
...
src/layouts/default/header/LayoutMultipleHeader.less
浏览文件 @
1293a738
.multiple-tab-header {
.multiple-tab-header {
flex: 0 0 auto
;
margin-left: 1px
;
transition: width 0.2s;
transition: width 0.2s;
flex: 0 0 auto;
&.dark {
&.dark {
margin-left:
-1px
;
margin-left:
0
;
}
}
&.fixed {
&.fixed {
...
...
src/layouts/default/index.less
浏览文件 @
1293a738
...
@@ -12,6 +12,6 @@
...
@@ -12,6 +12,6 @@
}
}
&__main {
&__main {
margin-left:
2
px;
margin-left:
1
px;
}
}
}
}
src/layouts/default/sider/index.less
浏览文件 @
1293a738
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
}
}
&:not(.ant-layout-sider-dark) {
&:not(.ant-layout-sider-dark) {
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
//
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
.ant-layout-sider-trigger {
.ant-layout-sider-trigger {
color: @text-color-base;
color: @text-color-base;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录