Skip to content

Commit 4abe40d

Browse files
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
� Conflicts: � src/api/system/area/index.ts � src/views/system/area/index.vue
2 parents fa32194 + 9d72a37 commit 4abe40d

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

src/components/XTable/src/XTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const getColumnsConfig = (options: XTableProps) => {
128128
proxyForm = true
129129
options.formConfig = {
130130
enabled: true,
131-
titleWidth: 180,
131+
titleWidth: 110,
132132
titleAlign: 'right',
133133
items: allSchemas.searchSchema
134134
}

src/layout/components/UserInfo/src/UserInfo.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ const toDocument = () => {
6666
<Icon icon="ep:menu" />
6767
<div @click="toDocument">{{ t('common.document') }}</div>
6868
</ElDropdownItem>
69-
<ElDropdownItem divided>
69+
<ElDropdownItem divided @click="loginOut">
7070
<Icon icon="ep:switch-button" />
71-
<div @click="loginOut">{{ t('common.loginOut') }}</div>
71+
<div>{{ t('common.loginOut') }}</div>
7272
</ElDropdownItem>
7373
</ElDropdownMenu>
7474
</template>

src/views/system/area/area.data.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
2+
3+
// CrudSchema
4+
const crudSchemas = reactive<VxeCrudSchema>({
5+
primaryKey: 'id',
6+
primaryType: null,
7+
action: false,
8+
columns: [
9+
{
10+
title: '编号',
11+
field: 'id',
12+
table: {
13+
treeNode: true,
14+
align: 'left'
15+
}
16+
},
17+
{
18+
title: '名字',
19+
field: 'name'
20+
}
21+
]
22+
})
23+
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

0 commit comments

Comments
 (0)