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
This commit is contained in:
commit
4abe40d413
@ -128,7 +128,7 @@ const getColumnsConfig = (options: XTableProps) => {
|
|||||||
proxyForm = true
|
proxyForm = true
|
||||||
options.formConfig = {
|
options.formConfig = {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
titleWidth: 180,
|
titleWidth: 110,
|
||||||
titleAlign: 'right',
|
titleAlign: 'right',
|
||||||
items: allSchemas.searchSchema
|
items: allSchemas.searchSchema
|
||||||
}
|
}
|
||||||
|
@ -66,9 +66,9 @@ const toDocument = () => {
|
|||||||
<Icon icon="ep:menu" />
|
<Icon icon="ep:menu" />
|
||||||
<div @click="toDocument">{{ t('common.document') }}</div>
|
<div @click="toDocument">{{ t('common.document') }}</div>
|
||||||
</ElDropdownItem>
|
</ElDropdownItem>
|
||||||
<ElDropdownItem divided>
|
<ElDropdownItem divided @click="loginOut">
|
||||||
<Icon icon="ep:switch-button" />
|
<Icon icon="ep:switch-button" />
|
||||||
<div @click="loginOut">{{ t('common.loginOut') }}</div>
|
<div>{{ t('common.loginOut') }}</div>
|
||||||
</ElDropdownItem>
|
</ElDropdownItem>
|
||||||
</ElDropdownMenu>
|
</ElDropdownMenu>
|
||||||
</template>
|
</template>
|
||||||
|
23
src/views/system/area/area.data.ts
Normal file
23
src/views/system/area/area.data.ts
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
|
||||||
|
|
||||||
|
// CrudSchema
|
||||||
|
const crudSchemas = reactive<VxeCrudSchema>({
|
||||||
|
primaryKey: 'id',
|
||||||
|
primaryType: null,
|
||||||
|
action: false,
|
||||||
|
columns: [
|
||||||
|
{
|
||||||
|
title: '编号',
|
||||||
|
field: 'id',
|
||||||
|
table: {
|
||||||
|
treeNode: true,
|
||||||
|
align: 'left'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '名字',
|
||||||
|
field: 'name'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
|
Loading…
Reference in New Issue
Block a user