diff --git a/src/components/table/use-table.tsx b/src/components/table/use-table.tsx
index 88de913..3035722 100644
--- a/src/components/table/use-table.tsx
+++ b/src/components/table/use-table.tsx
@@ -191,7 +191,7 @@ export const useTable = (optionsOrFn: UseTableOptions | (() => UseTableOptions))
}
}
}
- const merged = merge({}, options.create, options.modify);
+ const merged = merge({ modalProps: { titleAlign: 'start', closable: false } }, options.create, options.modify);
options.modify = useFormModal(merged as any) as any;
} else {
options.modify = useFormModal(options.modify as any) as any;
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index 34c7582..534565e 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -225,7 +225,7 @@ const user = reactive({
"meta": {
"sort": 30401,
"title": "个人设置",
- "icon": "icon-park-outline-user"
+ "icon": "icon-park-outline-config"
}
}
diff --git a/src/pages/post/index.vue b/src/pages/post/index.vue
index b62cb14..06d723b 100644
--- a/src/pages/post/index.vue
+++ b/src/pages/post/index.vue
@@ -2,12 +2,18 @@
-
+
-
+
导出
+
+
+
+
+ 导入
+
@@ -46,6 +52,12 @@
+
+
+ 请按照 上传模板 中的格式进行填写,上传文件后系统将自动导入数据
+
+
+
diff --git a/src/pages/system/role/index.vue b/src/pages/system/role/index.vue
index 7edf602..7424f72 100644
--- a/src/pages/system/role/index.vue
+++ b/src/pages/system/role/index.vue
@@ -97,7 +97,7 @@ const table = useTable({
type: "textarea",
},
{
- field: "permissions",
+ field: "permissionIds",
label: "关联权限",
type: "select",
options: () => api.permission.getPermissions(),
diff --git a/src/pages/system/user/index.vue b/src/pages/system/user/index.vue
index 263e700..6d2d1b8 100644
--- a/src/pages/system/user/index.vue
+++ b/src/pages/system/user/index.vue
@@ -81,7 +81,7 @@ const table = useTable({
},
nodeProps: {
placeholder: "输入用户昵称关键字",
- }
+ },
},
],
},
@@ -101,7 +101,7 @@ const table = useTable({
},
formProps: {
layout: "vertical",
- class: "!grid grid-cols-2 gap-x-3",
+ class: "!grid grid-cols-2 gap-x-6",
},
items: [
{
@@ -118,7 +118,10 @@ const table = useTable({
{
field: "description",
label: "个人描述",
- type: "input",
+ type: "textarea",
+ itemProps: {
+ class: 'col-span-2'
+ }
},
{
field: "password",
@@ -126,15 +129,25 @@ const table = useTable({
type: "password",
},
{
- label: "头像",
- field: "avatar",
+ field: "roleIds",
+ label: "关联角色",
type: "select",
+ options: () => api.role.getRoles(),
+ nodeProps: {
+ multiple: true,
+ },
},
{
- field: "[startTime,endTime]",
- label: "日期范围",
- type: "dateRange",
- nodeProps: {},
+ label: "头像",
+ field: "avatarId",
+ type: "custom",
+ component: ({ field, model }) => {
+ return (
+
+
+
+ );
+ },
},
],
submit: ({ model }) => {
diff --git a/src/types/auto-component.d.ts b/src/types/auto-component.d.ts
index c858280..7e365fd 100644
--- a/src/types/auto-component.d.ts
+++ b/src/types/auto-component.d.ts
@@ -7,6 +7,7 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
+ AAlert: typeof import('@arco-design/web-vue')['Alert']
AAvatar: typeof import('@arco-design/web-vue')['Avatar']
ABadge: typeof import('@arco-design/web-vue')['Badge']
ABreadcrumb: typeof import('@arco-design/web-vue')['Breadcrumb']
@@ -50,6 +51,7 @@ declare module '@vue/runtime-core' {
ATextarea: typeof import('@arco-design/web-vue')['Textarea']
ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
ATree: typeof import('@arco-design/web-vue')['Tree']
+ AUpload: typeof import('@arco-design/web-vue')['Upload']
BreadCrumb: typeof import('./../components/breadcrumb/bread-crumb.vue')['default']
BreadPage: typeof import('./../components/breadcrumb/bread-page.vue')['default']
Page403: typeof import('./../components/error/page-403.vue')['default']