diff --git a/packages/client/src/components/admin-layout/More.tsx b/packages/client/src/components/admin-layout/More.tsx
index 4367d2062..133ad71d5 100644
--- a/packages/client/src/components/admin-layout/More.tsx
+++ b/packages/client/src/components/admin-layout/More.tsx
@@ -80,12 +80,6 @@ const schema: ISchema = {
// accept: 'jpg,png'
},
},
- showLogoOnly: {
- type: 'boolean',
- 'x-decorator': 'FormItem',
- 'x-component': 'Checkbox',
- 'x-content': '只显示 LOGO',
- },
},
},
},
diff --git a/packages/client/src/components/admin-layout/Permissions/index.tsx b/packages/client/src/components/admin-layout/Permissions/index.tsx
index 2b3740ea0..397f869eb 100644
--- a/packages/client/src/components/admin-layout/Permissions/index.tsx
+++ b/packages/client/src/components/admin-layout/Permissions/index.tsx
@@ -316,16 +316,16 @@ const schema: ISchema = {
properties: {
title: {
type: 'string',
- title: '权限名称',
- 'x-component': 'Input',
- 'x-decorator': 'FormilyFormItem',
- },
- name: {
- type: 'string',
- title: '权限标识',
+ title: '权限组名称',
'x-component': 'Input',
'x-decorator': 'FormilyFormItem',
},
+ // name: {
+ // type: 'string',
+ // title: '权限组标识',
+ // 'x-component': 'Input',
+ // 'x-decorator': 'FormilyFormItem',
+ // },
},
},
},
@@ -334,7 +334,7 @@ const schema: ISchema = {
},
column1: {
type: 'void',
- title: '权限名称',
+ title: '权限组名称',
'x-component': 'Table.Column',
properties: {
title: {
@@ -344,18 +344,18 @@ const schema: ISchema = {
},
},
},
- column2: {
- type: 'void',
- title: '权限标识',
- 'x-component': 'Table.Column',
- properties: {
- name: {
- type: 'string',
- 'x-component': 'Input',
- 'x-read-pretty': true,
- },
- },
- },
+ // column2: {
+ // type: 'void',
+ // title: '权限组标识',
+ // 'x-component': 'Table.Column',
+ // properties: {
+ // name: {
+ // type: 'string',
+ // 'x-component': 'Input',
+ // 'x-read-pretty': true,
+ // },
+ // },
+ // },
[uid()]: {
type: 'void',
title: '操作',
@@ -382,7 +382,7 @@ const schema: ISchema = {
properties: {
[uid()]: {
type: 'void',
- title: '权限配置',
+ title: '配置权限',
'x-decorator': 'RoleProvider',
'x-component': 'Action.Drawer',
'x-component-props': {
@@ -431,7 +431,7 @@ const schema: ISchema = {
properties: {
[uid()]: {
type: 'void',
- title: '编辑数据',
+ title: '编辑权限组',
'x-decorator': 'Form',
'x-decorator-props': {
useResource: useDetailsResource,
@@ -443,7 +443,7 @@ const schema: ISchema = {
properties: {
title: {
type: 'string',
- title: '权限名称',
+ title: '权限组名称',
'x-component': 'Input',
'x-decorator': 'FormilyFormItem',
},
diff --git a/packages/client/src/components/admin-layout/SiteTitle.tsx b/packages/client/src/components/admin-layout/SiteTitle.tsx
index 4f5f9beb1..324bc895d 100644
--- a/packages/client/src/components/admin-layout/SiteTitle.tsx
+++ b/packages/client/src/components/admin-layout/SiteTitle.tsx
@@ -38,9 +38,6 @@ export const SiteTitle = () => {
{!loading && data?.logo?.url && (
)}
- {!loading && !data?.showLogoOnly && data?.title && (
-
{data.title}
- )}
);
};
diff --git a/packages/client/src/schemas/action/ActionBar.tsx b/packages/client/src/schemas/action/ActionBar.tsx
index 9b6ab9b7c..8438a74ed 100644
--- a/packages/client/src/schemas/action/ActionBar.tsx
+++ b/packages/client/src/schemas/action/ActionBar.tsx
@@ -130,7 +130,7 @@ function generateActionSchema(type) {
useResource: '{{ Table.useResource }}',
useValues: '{{ Table.useTableRowRecord }}',
},
- 'x-component': 'Action.Modal',
+ 'x-component': 'Action.Drawer',
'x-component-props': {
useOkAction: '{{ Table.useTableUpdateAction }}',
},
@@ -175,12 +175,12 @@ function AddActionButton() {
}
return (
-
+
{[
{ title: '编辑', name: 'update' },
{ title: '删除', name: 'destroy' },
diff --git a/packages/client/src/schemas/action/index.tsx b/packages/client/src/schemas/action/index.tsx
index 61d51cafe..888bb8f61 100644
--- a/packages/client/src/schemas/action/index.tsx
+++ b/packages/client/src/schemas/action/index.tsx
@@ -180,6 +180,7 @@ Action.Modal = observer((props: any) => {
title={schema.title}
destroyOnClose
maskClosable
+ width={'50%'}
footer={
isFormDecorator && !schema['x-read-pretty']
? [
@@ -192,7 +193,7 @@ Action.Modal = observer((props: any) => {
setVisible(false);
}}
>
- Cancel
+ 取消
,
,
]
: null
@@ -257,7 +258,7 @@ Action.Drawer = observer((props: any) => {
setVisible(false);
}}
>
- Cancel
+ 取消
)
@@ -412,7 +413,7 @@ Action.DesignableBar = (props: any) => {
{
setVisible(visible);
@@ -421,7 +422,7 @@ Action.DesignableBar = (props: any) => {