Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
966a1712
Commit
966a1712
authored
Nov 30, 2023
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码
parent
42bb8f64
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
76 additions
and
84 deletions
+76
-84
readme.txt
ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt
+0
-1
App.vue
ruoyi-ui/src/App.vue
+7
-7
index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
+1
-1
index.vue
ruoyi-ui/src/components/TopNav/index.vue
+2
-2
dragHeight.js
ruoyi-ui/src/directive/dialog/dragHeight.js
+31
-31
dragWidth.js
ruoyi-ui/src/directive/dialog/dragWidth.js
+27
-27
SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
+2
-2
tab.js
ruoyi-ui/src/plugins/tab.js
+1
-1
permission.js
ruoyi-ui/src/utils/permission.js
+4
-8
validate.js
ruoyi-ui/src/utils/validate.js
+1
-4
No files found.
ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt
deleted
100644 → 0
View file @
42bb8f64
如果使用的是RuoYi-Vue3前端,那么需要覆盖一下此目录的模板index.vue.vm、index-tree.vue.vm文件到上级vue目录。
\ No newline at end of file
ruoyi-ui/src/App.vue
View file @
966a1712
...
...
@@ -11,14 +11,14 @@ import ThemePicker from "@/components/ThemePicker";
export
default
{
name
:
"App"
,
components
:
{
ThemePicker
},
metaInfo
()
{
return
{
title
:
this
.
$store
.
state
.
settings
.
dynamicTitle
&&
this
.
$store
.
state
.
settings
.
title
,
titleTemplate
:
title
=>
{
return
title
?
`
${
title
}
-
${
process
.
env
.
VUE_APP_TITLE
}
`
:
process
.
env
.
VUE_APP_TITLE
}
}
metaInfo
()
{
return
{
title
:
this
.
$store
.
state
.
settings
.
dynamicTitle
&&
this
.
$store
.
state
.
settings
.
title
,
titleTemplate
:
title
=>
{
return
title
?
`
${
title
}
-
${
process
.
env
.
VUE_APP_TITLE
}
`
:
process
.
env
.
VUE_APP_TITLE
}
}
}
};
</
script
>
<
style
scoped
>
...
...
ruoyi-ui/src/components/ImageUpload/index.vue
View file @
966a1712
...
...
@@ -168,7 +168,7 @@ export default {
// 删除图片
handleDelete
(
file
)
{
const
findex
=
this
.
fileList
.
map
(
f
=>
f
.
name
).
indexOf
(
file
.
name
);
if
(
findex
>
-
1
)
{
if
(
findex
>
-
1
)
{
this
.
fileList
.
splice
(
findex
,
1
);
this
.
$emit
(
"input"
,
this
.
listToString
(
this
.
fileList
));
}
...
...
ruoyi-ui/src/components/TopNav/index.vue
View file @
966a1712
...
...
@@ -57,9 +57,9 @@ export default {
if
(
menu
.
hidden
!==
true
)
{
// 兼容顶部栏一级菜单内部跳转
if
(
menu
.
path
===
"/"
)
{
topMenus
.
push
(
menu
.
children
[
0
]);
topMenus
.
push
(
menu
.
children
[
0
]);
}
else
{
topMenus
.
push
(
menu
);
topMenus
.
push
(
menu
);
}
}
});
...
...
ruoyi-ui/src/directive/dialog/dragHeight.js
View file @
966a1712
/**
* v-dialogDragWidth 可拖动弹窗高度(右下角)
* Copyright (c) 2019 ruoyi
*/
* v-dialogDragWidth 可拖动弹窗高度(右下角)
* Copyright (c) 2019 ruoyi
*/
export
default
{
bind
(
el
)
{
const
dragDom
=
el
.
querySelector
(
'.el-dialog'
);
const
lineEl
=
document
.
createElement
(
'div'
);
lineEl
.
style
=
'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;'
;
lineEl
.
addEventListener
(
'mousedown'
,
function
(
e
)
{
// 鼠标按下,计算当前元素距离可视区的距离
const
disX
=
e
.
clientX
-
el
.
offsetLeft
;
const
disY
=
e
.
clientY
-
el
.
offsetTop
;
// 当前宽度 高度
const
curWidth
=
dragDom
.
offsetWidth
;
const
curHeight
=
dragDom
.
offsetHeight
;
document
.
onmousemove
=
function
(
e
)
{
e
.
preventDefault
();
// 移动时禁用默认事件
// 通过事件委托,计算移动的距离
const
xl
=
e
.
clientX
-
disX
;
const
yl
=
e
.
clientY
-
disY
dragDom
.
style
.
width
=
`
${
curWidth
+
xl
}
px`
;
dragDom
.
style
.
height
=
`
${
curHeight
+
yl
}
px`
;
};
document
.
onmouseup
=
function
(
e
)
{
document
.
onmousemove
=
null
;
document
.
onmouseup
=
null
;
};
},
false
);
dragDom
.
appendChild
(
lineEl
);
}
}
\ No newline at end of file
bind
(
el
)
{
const
dragDom
=
el
.
querySelector
(
'.el-dialog'
);
const
lineEl
=
document
.
createElement
(
'div'
);
lineEl
.
style
=
'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;'
;
lineEl
.
addEventListener
(
'mousedown'
,
function
(
e
)
{
// 鼠标按下,计算当前元素距离可视区的距离
const
disX
=
e
.
clientX
-
el
.
offsetLeft
;
const
disY
=
e
.
clientY
-
el
.
offsetTop
;
// 当前宽度 高度
const
curWidth
=
dragDom
.
offsetWidth
;
const
curHeight
=
dragDom
.
offsetHeight
;
document
.
onmousemove
=
function
(
e
)
{
e
.
preventDefault
();
// 移动时禁用默认事件
// 通过事件委托,计算移动的距离
const
xl
=
e
.
clientX
-
disX
;
const
yl
=
e
.
clientY
-
disY
dragDom
.
style
.
width
=
`
${
curWidth
+
xl
}
px`
;
dragDom
.
style
.
height
=
`
${
curHeight
+
yl
}
px`
;
};
document
.
onmouseup
=
function
(
e
)
{
document
.
onmousemove
=
null
;
document
.
onmouseup
=
null
;
};
},
false
);
dragDom
.
appendChild
(
lineEl
);
}
}
ruoyi-ui/src/directive/dialog/dragWidth.js
View file @
966a1712
/**
* v-dialogDragWidth 可拖动弹窗宽度(右侧边)
* Copyright (c) 2019 ruoyi
*/
* v-dialogDragWidth 可拖动弹窗宽度(右侧边)
* Copyright (c) 2019 ruoyi
*/
export
default
{
bind
(
el
)
{
const
dragDom
=
el
.
querySelector
(
'.el-dialog'
);
const
lineEl
=
document
.
createElement
(
'div'
);
lineEl
.
style
=
'width: 5px; background: inherit; height: 80%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;'
;
lineEl
.
addEventListener
(
'mousedown'
,
function
(
e
)
{
// 鼠标按下,计算当前元素距离可视区的距离
const
disX
=
e
.
clientX
-
el
.
offsetLeft
;
// 当前宽度
const
curWidth
=
dragDom
.
offsetWidth
;
document
.
onmousemove
=
function
(
e
)
{
e
.
preventDefault
();
// 移动时禁用默认事件
// 通过事件委托,计算移动的距离
const
l
=
e
.
clientX
-
disX
;
dragDom
.
style
.
width
=
`
${
curWidth
+
l
}
px`
;
};
document
.
onmouseup
=
function
(
e
)
{
document
.
onmousemove
=
null
;
document
.
onmouseup
=
null
;
};
},
false
);
dragDom
.
appendChild
(
lineEl
);
}
}
\ No newline at end of file
bind
(
el
)
{
const
dragDom
=
el
.
querySelector
(
'.el-dialog'
);
const
lineEl
=
document
.
createElement
(
'div'
);
lineEl
.
style
=
'width: 5px; background: inherit; height: 80%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;'
;
lineEl
.
addEventListener
(
'mousedown'
,
function
(
e
)
{
// 鼠标按下,计算当前元素距离可视区的距离
const
disX
=
e
.
clientX
-
el
.
offsetLeft
;
// 当前宽度
const
curWidth
=
dragDom
.
offsetWidth
;
document
.
onmousemove
=
function
(
e
)
{
e
.
preventDefault
();
// 移动时禁用默认事件
// 通过事件委托,计算移动的距离
const
l
=
e
.
clientX
-
disX
;
dragDom
.
style
.
width
=
`
${
curWidth
+
l
}
px`
;
};
document
.
onmouseup
=
function
(
e
)
{
document
.
onmousemove
=
null
;
document
.
onmouseup
=
null
;
};
},
false
);
dragDom
.
appendChild
(
lineEl
);
}
}
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
View file @
966a1712
...
...
@@ -13,8 +13,8 @@
<item
v-if=
"item.meta"
:icon=
"item.meta && item.meta.icon"
:title=
"item.meta.title"
/>
</
template
>
<sidebar-item
v-for=
"
child
in item.children"
:key=
"child.path"
v-for=
"
(child, index)
in item.children"
:key=
"child.path
+ index
"
:is-nest=
"true"
:item=
"child"
:base-path=
"resolvePath(child.path)"
...
...
ruoyi-ui/src/plugins/tab.js
View file @
966a1712
...
...
@@ -60,7 +60,7 @@ export default {
},
// 添加tab页签
openPage
(
title
,
url
,
params
)
{
var
obj
=
{
path
:
url
,
meta
:
{
title
:
title
}
}
const
obj
=
{
path
:
url
,
meta
:
{
title
:
title
}
}
store
.
dispatch
(
'tagsView/addView'
,
obj
);
return
router
.
push
({
path
:
url
,
query
:
params
});
},
...
...
ruoyi-ui/src/utils/permission.js
View file @
966a1712
...
...
@@ -15,10 +15,8 @@ export function checkPermi(value) {
return
all_permission
===
permission
||
permissionDatas
.
includes
(
permission
)
})
if
(
!
hasPermission
)
{
return
false
}
return
true
return
hasPermission
;
}
else
{
console
.
error
(
`need roles! Like checkPermi="['system:user:add','system:user:edit']"`
)
return
false
...
...
@@ -40,10 +38,8 @@ export function checkRole(value) {
return
super_admin
===
role
||
permissionRoles
.
includes
(
role
)
})
if
(
!
hasRole
)
{
return
false
}
return
true
return
hasRole
;
}
else
{
console
.
error
(
`need roles! Like checkRole="['admin','editor']"`
)
return
false
...
...
ruoyi-ui/src/utils/validate.js
View file @
966a1712
...
...
@@ -65,10 +65,7 @@ export function validEmail(email) {
* @returns {Boolean}
*/
export
function
isString
(
str
)
{
if
(
typeof
str
===
'string'
||
str
instanceof
String
)
{
return
true
}
return
false
return
typeof
str
===
'string'
||
str
instanceof
String
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment