Skip to content

Commit 016472b

Browse files
YunaiVgitee-org
authored andcommitted
!16 1.角色提交问题修改 2.XTable var修改
Merge pull request !16 from 毕梅/master
2 parents 3af544f + ece4cf2 commit 016472b

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

src/components/XTable/src/XTable.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ const prefixCls = getPrefixCls('x-vxe-table')
2626
const attrs = useAttrs()
2727
const emit = defineEmits(['register'])
2828
const removeStyles = () => {
29-
var filename = 'cssTheme'
29+
const filename = 'cssTheme'
3030
//移除引入的文件名
31-
var targetelement = 'style'
32-
var targetattr = 'id'
33-
var allsuspects = document.getElementsByTagName(targetelement)
34-
for (var i = allsuspects.length; i >= 0; i--) {
31+
const targetelement = 'style'
32+
const targetattr = 'id'
33+
let allsuspects = document.getElementsByTagName(targetelement)
34+
for (let i = allsuspects.length; i >= 0; i--) {
3535
if (
3636
allsuspects[i] &&
3737
allsuspects[i].getAttribute(targetattr) != null &&
@@ -43,8 +43,8 @@ const removeStyles = () => {
4343
}
4444
}
4545
const reImport = () => {
46-
var head = document.getElementsByTagName('head')[0]
47-
var style = document.createElement('style')
46+
let head = document.getElementsByTagName('head')[0]
47+
let style = document.createElement('style')
4848
style.innerText = styleCss
4949
style.id = 'cssTheme'
5050
head.appendChild(style)

src/views/system/role/index.vue

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,21 @@
111111
>
112112
<el-card class="card" shadow="never">
113113
<template #header>
114-
<!--父子联动(选中父节点,自动选择子节点):-->
115-
<!--<el-switch v-model="checkStrictly" inline-prompt active-text="是" inactive-text="否" />-->
116-
<!--全选/全不选:-->
117-
<!--<el-switch-->
118-
<!-- v-model="treeNodeAll"-->
119-
<!-- inline-prompt-->
120-
<!-- active-text="是"-->
121-
<!-- inactive-text="否"-->
122-
<!-- @change="handleCheckedTreeNodeAll()"-->
123-
<!--/>-->
114+
父子联动(选中父节点,自动选择子节点):
115+
<el-switch
116+
v-model="checkStrictly"
117+
inline-prompt
118+
active-text=""
119+
inactive-text=""
120+
/>
121+
全选/全不选:
122+
<el-switch
123+
v-model="treeNodeAll"
124+
inline-prompt
125+
active-text=""
126+
inactive-text=""
127+
@change="handleCheckedTreeNodeAll()"
128+
/>
124129
</template>
125130
<el-tree
126131
ref="treeRef"
@@ -250,12 +255,12 @@ const dialogScopeTitle = ref('数据权限')
250255
const actionScopeType = ref('')
251256
const dataScopeDictDatas = ref()
252257
// 选项
253-
const checkStrictly = ref(false)
254-
// const treeNodeAll = ref(false)
258+
const checkStrictly = ref(true)
259+
const treeNodeAll = ref(false)
255260
// 全选/全不选
256-
// const handleCheckedTreeNodeAll = () => {
257-
// treeRef.value!.setCheckedNodes(treeNodeAll.value ? treeOptions.value : [])
258-
// }
261+
const handleCheckedTreeNodeAll = () => {
262+
treeRef.value!.setCheckedNodes(treeNodeAll.value ? treeOptions.value : [])
263+
}
259264
// 权限操作
260265
const handleScope = async (type: string, row: RoleApi.RoleVO) => {
261266
dataScopeForm.id = row.id

0 commit comments

Comments
 (0)