feat: improve code

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',
-                },
               },
             },
           },

packages/client/src/components/admin-layout/Permissions/index.tsx

@@ -316,16 +316,16 @@ const schema: ISchema = {
                       properties: {
                         title: {
                           type: 'string',
-                          title: '权限名称',
+                          title: '权限组名称',
-                          'x-component': 'Input',
-                          'x-decorator': 'FormilyFormItem',
-                        },
-                        name: {
-                          type: 'string',
-                          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: {
+            // column2: {
-              type: 'void',
+            //   type: 'void',
-              title: '权限标识',
+            //   title: '权限组标识',
-              'x-component': 'Table.Column',
+            //   'x-component': 'Table.Column',
-              properties: {
+            //   properties: {
-                name: {
+            //     name: {
-                  type: 'string',
+            //       type: 'string',
-                  'x-component': 'Input',
+            //       'x-component': 'Input',
-                  'x-read-pretty': true,
+            //       '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',
                             },

packages/client/src/components/admin-layout/SiteTitle.tsx

@@ -38,9 +38,6 @@ export const SiteTitle = () => {
       {!loading && data?.logo?.url && (
         <img className={'site-logo'} src={data?.logo?.url} />
       )}
-      {!loading && !data?.showLogoOnly && data?.title && (
-        <div className={'site-title'}>{data.title}</div>
-      )}
     </div>
   );
 };

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 (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlay={
         <Menu>
-          <Menu.ItemGroup title={'操作展示'}>
+          <Menu.ItemGroup title={'启用操作'}>
             {[
               { title: '编辑', name: 'update' },
               { title: '删除', name: 'destroy' },

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
+                取消
               </Button>,
               <Button
                 type={'primary'}
@@ -204,7 +205,7 @@ Action.Modal = observer((props: any) => {
                   setVisible(false);
                 }}
               >
-                OK
+                确定
               </Button>,
             ]
           : null
@@ -257,7 +258,7 @@ Action.Drawer = observer((props: any) => {
                     setVisible(false);
                   }}
                 >
-                  Cancel
+                  取消
                 </Button>
                 <Button
                   onClick={async (e) => {
@@ -268,7 +269,7 @@ Action.Drawer = observer((props: any) => {
                   }}
                   type={'primary'}
                 >
-                  OK
+                  确定
                 </Button>
               </Space>
             )
@@ -412,7 +413,7 @@ Action.DesignableBar = (props: any) => {
         <Space size={2}>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -421,7 +422,7 @@ Action.DesignableBar = (props: any) => {
               <Menu>
                 <Menu.Item
                   onClick={async (e) => {
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -460,7 +461,7 @@ Action.DesignableBar = (props: any) => {
                     refresh();
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 {isPopup && (
                   <Menu.Item>

packages/client/src/schemas/add-new/index.tsx

@@ -365,7 +365,7 @@ function generateCardItemSchema(component) {
       properties: {
         create: {
           type: 'void',
-          title: '添加卡片',
+          title: '新增卡片',
           // 'x-designable-bar': 'Kanban.AddCardDesignableBar',
           'x-component': 'Kanban.Card.AddNew',
           // 'x-decorator': 'AddNew.Displayed',
@@ -939,7 +939,7 @@ AddNew.CardItem = observer((props: any) => {
   const { collections = [], loading, refresh } = useCollectionsContext();
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       overlayStyle={{
         minWidth: 200,
       }}
@@ -1357,7 +1357,7 @@ AddNew.FormItem = observer((props: any) => {
   const displayed = useDisplayedMapContext();
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlayStyle={{
@@ -1365,7 +1365,7 @@ AddNew.FormItem = observer((props: any) => {
       }}
       overlay={
         <Menu>
-          <Menu.ItemGroup className={'display-fields'} title={`字段展示`}>
+          <Menu.ItemGroup className={'display-fields'} title={`显示字段`}>
             {fields?.map((field) => (
               <SwitchMenuItem
                 key={field.key}
@@ -1548,7 +1548,7 @@ AddNew.PaneItem = observer((props: any) => {
   console.log('AddNew.PaneItem.useResource', useResource);
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlayStyle={{
@@ -1735,7 +1735,6 @@ AddNew.PaneItem = observer((props: any) => {
         <PlusOutlined />
       ) : (
         <Button
-          block
           className={'designable-btn designable-btn-dash'}
           type={'dashed'}
           icon={<PlusOutlined />}

packages/client/src/schemas/calendar/Action.tsx

@@ -52,7 +52,7 @@ export const ActionDesignableBar = (props: any) => {
         <Space size={2}>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/calendar/ActionBar.tsx

@@ -210,12 +210,12 @@ function AddActionButton() {
   }
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlay={
         <Menu>
-          <Menu.ItemGroup title={'操作展示'}>
+          <Menu.ItemGroup title={'启用操作'}>
             {[
               { title: '今天', name: 'today' },
               { title: '翻页', name: 'nav' },

packages/client/src/schemas/calendar/DesignableBar.tsx

@@ -63,7 +63,7 @@ export const DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -173,7 +173,7 @@ export const DesignableBar = observer((props) => {
                   key={'defaultFilter'}
                   onClick={async () => {
                     const { defaultFilter } = await FormDialog(
-                      '设置筛选范围',
+                      '设置数据范围',
                       () => {
                         return (
                           <FormLayout layout={'vertical'}>
@@ -204,7 +204,7 @@ export const DesignableBar = observer((props) => {
                     await updateSchema(schema);
                   }}
                 >
-                  设置筛选范围
+                  设置数据范围
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item

packages/client/src/schemas/calendar/index.tsx

@@ -479,14 +479,14 @@ Calendar.Filter.DesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
             }}
             overlay={
               <Menu>
-                <Menu.ItemGroup title={'筛选字段'}>
+                <Menu.ItemGroup title={'可筛选字段'}>
                   {fields
                     .filter((collectionField) => {
                       const option = interfaces.get(collectionField.interface);
@@ -520,7 +520,7 @@ Calendar.Filter.DesignableBar = () => {
                 <Menu.Item
                   onClick={async (e) => {
                     setVisible(false);
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -559,7 +559,7 @@ Calendar.Filter.DesignableBar = () => {
                     refresh();
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item

packages/client/src/schemas/cascader/index.tsx

@@ -12,7 +12,7 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { CascaderOptionType } from 'antd/lib/cascader';
 import { ArrayField } from '@formily/core';
 import { toArr } from '@formily/shared';
-import { omit } from 'lodash';
+import { isBoolean, omit } from 'lodash';
 
 const defaultFieldNames = {
   label: 'label',
@@ -29,9 +29,11 @@ export const Cascader = connect(
       loadData,
       labelInValue,
       fieldNames = defaultFieldNames,
+      changeOnSelectLast,
+      changeOnSelect,
       ...others
     } = props;
-    console.log('Cascader', props);
+    console.log('changeOnSelectLast', changeOnSelectLast);
     // 兼容值为 object[] 的情况
     const toValue = () => {
       return toArr(value).map((item) => {
@@ -84,6 +86,9 @@ export const Cascader = connect(
     return (
       <AntdCascader
         {...others}
+        changeOnSelect={
+          isBoolean(changeOnSelectLast) ? !changeOnSelectLast : changeOnSelect
+        }
         value={toValue()}
         fieldNames={fieldNames}
         displayRender={displayRender}

packages/client/src/schemas/chart/index.tsx

@@ -60,7 +60,7 @@ Chart.DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/database-field/index.tsx

@@ -255,7 +255,7 @@ export const DatabaseCollection = observer((props) => {
           setVisible(false);
         }}
         footer={
-          <Space>
+          <Space style={{ float: 'right' }}>
             <Button
               onClick={() => {
                 setVisible(false);

packages/client/src/schemas/database-field/interfaces/chinaRegion.ts

@@ -17,7 +17,7 @@ export const chinaRegion: FieldOptions = {
       // title,
       'x-component': 'Cascader',
       'x-component-props': {
-        changeOnSelect: true,
+        changeOnSelectLast: false,
         loadData: '{{ ChinaRegion.loadData }}',
         labelInValue: true,
         maxLevel: 3,
@@ -48,10 +48,10 @@ export const chinaRegion: FieldOptions = {
         { value: 5, label: '村/居委会' },
       ],
     },
-    'uiSchema.x-component-props.changeOnSelect': {
+    'uiSchema.x-component-props.changeOnSelectLast': {
       type: 'boolean',
       'x-component': 'Checkbox',
-      'x-content': '无需选到最后一级',
+      'x-content': '必须选到最后一级',
       'x-decorator': 'FormItem',
     },
   },

packages/client/src/schemas/filter/index.tsx

@@ -131,22 +131,25 @@ export function FilterList(props) {
           );
         })}
       </div>
-      <a
+      <div style={{ marginTop: 16 }}>
-        onClick={() => {
+        <a
-          set(uid(), {});
+          onClick={() => {
-        }}
+            set(uid(), {});
-      >
+          }}
-        添加条件
+        >
-      </a>{' '}
+          添加条件
-      <a
+        </a>
-        onClick={() => {
+        <a
-          set(uid(), {
+          style={{ marginLeft: 16 }}
-            and: [{}],
+          onClick={() => {
-          });
+            set(uid(), {
-        }}
+              and: [{}],
-      >
+            });
-        添加条件组
+          }}
-      </a>
+        >
+          添加条件组
+        </a>
+      </div>
     </div>
   );
 }

packages/client/src/schemas/form-item/index.tsx

@@ -46,7 +46,7 @@ FormItem.DesignableBar = () => {
           <AddNew.FormItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/form/DesignableBar.tsx

@@ -42,9 +42,11 @@ export const DesignableBar = observer((props) => {
   const { collection } = useCollection({ collectionName });
   return (
     <div className={cls('designable-bar', { active: visible })}>
-      <div className={'designable-info'}>
+      {collection && (
-        {collection?.title || collection?.name}
+        <div className={'designable-info'}>
-      </div>
+          {collection?.title || collection?.name}
+        </div>
+      )}
       <span
         onClick={(e) => {
           e.stopPropagation();
@@ -55,7 +57,7 @@ export const DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/form/Field.DesignableBar.tsx

@@ -68,7 +68,7 @@ export const FieldDesignableBar = observer((props) => {
           <DragHandle />
           <Dropdown
             placement={'bottomRight'}
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/grid/DesignableBar.tsx

@@ -51,7 +51,7 @@ export const DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'appendChild'} ghost />
           {/* <DragHandle /> */}
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/grid/style.less

@@ -141,6 +141,7 @@ body.dragging {
     pointer-events: none;
   }
 }
+
 .nb-grid-row-divider {
   // background-color: #ddd;
   height: 24px;
@@ -149,10 +150,15 @@ body.dragging {
   margin-top: -24px;
   position: absolute;
   z-index: 20;
+  display: none;
   // opacity: 0.5;
   // background: #e6f7ff;
 }
-
+.nb-grid.active {
+  .nb-grid-row-divider {
+    display: block;
+  }
+}
 .nb-grid-col-divider {
   &.resizable {
     cursor: col-resize;

packages/client/src/schemas/input/index.tsx

@@ -62,7 +62,7 @@ Input.DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/kanban/CardDesignableBar.tsx

@@ -57,14 +57,14 @@ export const CardDesignableBar = observer((props) => {
       >
         <Space size={2}>
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
             }}
             overlay={
               <Menu>
-                <Menu.ItemGroup className={'display-fields'} title={`字段展示`}>
+                <Menu.ItemGroup className={'display-fields'} title={`显示字段`}>
                   {fields?.map((field) => (
                     <SwitchMenuItem
                       key={field.key}

packages/client/src/schemas/kanban/DesignableBar.tsx

@@ -52,7 +52,7 @@ export const DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -71,7 +71,7 @@ export const DesignableBar = observer((props) => {
                   key={'defaultFilter'}
                   onClick={async () => {
                     const { defaultFilter } = await FormDialog(
-                      '设置筛选范围',
+                      '设置数据范围',
                       () => {
                         return (
                           <FormLayout layout={'vertical'}>
@@ -102,7 +102,7 @@ export const DesignableBar = observer((props) => {
                     await updateSchema(schema);
                   }}
                 >
-                  设置筛选范围
+                  设置数据范围
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item

packages/client/src/schemas/kanban/FieldDesignableBar.tsx

@@ -68,7 +68,7 @@ export const FieldDesignableBar = observer((props) => {
           <DragHandle /> */}
           <Dropdown
             placement={'bottomRight'}
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/kanban/demos/demo1.tsx

@@ -126,7 +126,7 @@ const schema: ISchema = {
   properties: {
     create: {
       type: 'void',
-      title: '添加卡片',
+      title: '新增卡片',
       // 'x-designable-bar': 'Kanban.AddCardDesignableBar',
       'x-component': 'Kanban.Card.AddNew',
       // 'x-decorator': 'AddNew.Displayed',

packages/client/src/schemas/markdown/index.tsx

@@ -124,7 +124,7 @@ Markdown.Void.DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -183,7 +183,7 @@ Markdown.DesignableBar = observer((props) => {
           <AddNew.FormItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);

packages/client/src/schemas/menu/index.tsx

@@ -961,7 +961,7 @@ Menu.DesignableBar = (props) => {
                               properties: {
                                 roles: {
                                   type: 'array',
-                                  title: '权限组',
+                                  title: '可访问该菜单的权限组',
                                   'x-reactions': [
                                     '{{useAsyncDataSource(loadRoles)}}',
                                   ],

packages/client/src/schemas/table/SimpleDesignableBar.tsx

@@ -57,7 +57,7 @@ export const SimpleDesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -68,7 +68,7 @@ export const SimpleDesignableBar = observer((props) => {
                   key={'defaultFilter'}
                   onClick={async () => {
                     const { defaultFilter } = await FormDialog(
-                      '设置筛选范围',
+                      '设置数据范围',
                       () => {
                         return (
                           <FormLayout layout={'vertical'}>
@@ -174,7 +174,7 @@ export const SimpleDesignableBar = observer((props) => {
                     await updateSchema(schema);
                   }}
                 >
-                  设置筛选范围
+                  设置数据范围
                 </Menu.Item>
                 <Menu.Item key={'defaultPageSize'}>
                   每页默认显示{' '}

packages/client/src/schemas/table/index.tsx

@@ -435,12 +435,12 @@ function AddColumn() {
   // const { service } = useTable();
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlay={
         <Menu>
-          <Menu.ItemGroup className={'display-fields'} title={'字段展示'}>
+          <Menu.ItemGroup className={'display-fields'} title={'显示字段'}>
             {fields.map((field) => (
               <SwitchMenuItem
                 title={field?.uiSchema?.title}
@@ -1066,12 +1066,12 @@ function AddActionButton() {
   }
   return (
     <Dropdown
-      trigger={['click']}
+      trigger={['hover']}
       visible={visible}
       onVisibleChange={setVisible}
       overlay={
         <Menu>
-          <Menu.ItemGroup title={'操作展示'}>
+          <Menu.ItemGroup title={'启用操作'}>
             {[
               { title: '筛选', name: 'filter' },
               { title: '导出', name: 'export' },
@@ -1376,14 +1376,14 @@ Table.Filter.DesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
             }}
             overlay={
               <Menu>
-                <Menu.ItemGroup title={'筛选字段'}>
+                <Menu.ItemGroup title={'可筛选字段'}>
                   {fields
                     .filter((collectionField) => {
                       const option = interfaces.get(collectionField.interface);
@@ -1417,7 +1417,7 @@ Table.Filter.DesignableBar = () => {
                 <Menu.Item
                   onClick={async (e) => {
                     setVisible(false);
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -1456,7 +1456,7 @@ Table.Filter.DesignableBar = () => {
                     refresh();
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item
@@ -1505,7 +1505,7 @@ Table.ExportActionDesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -1540,7 +1540,7 @@ Table.ExportActionDesignableBar = () => {
                 <Menu.Item
                   onClick={async (e) => {
                     setVisible(false);
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -1579,7 +1579,7 @@ Table.ExportActionDesignableBar = () => {
                     refresh();
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item
@@ -1652,14 +1652,14 @@ Table.Operation.DesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
             }}
             overlay={
               <Menu>
-                <Menu.ItemGroup title={'操作展示'}>
+                <Menu.ItemGroup title={'启用操作'}>
                   {[
                     { title: '查看', name: 'view' },
                     { title: '编辑', name: 'update' },
@@ -1721,7 +1721,7 @@ Table.Action.DesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -1731,7 +1731,7 @@ Table.Action.DesignableBar = () => {
                 <Menu.Item
                   onClick={async (e) => {
                     setVisible(false);
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -1770,7 +1770,7 @@ Table.Action.DesignableBar = () => {
                     refresh();
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 {isPopup && (
                   <Menu.Item>
@@ -1902,7 +1902,7 @@ Table.Column.DesignableBar = () => {
         <Space>
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -1912,7 +1912,7 @@ Table.Column.DesignableBar = () => {
                 <Menu.Item
                   onClick={async (e) => {
                     setVisible(false);
-                    const values = await FormDialog('修改列标题', () => {
+                    const values = await FormDialog('自定义列名称', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -1928,7 +1928,7 @@ Table.Column.DesignableBar = () => {
                                 },
                                 title: {
                                   type: 'string',
-                                  title: '自定义列标题',
+                                  title: '自定义列名称',
                                   'x-decorator': 'FormItem',
                                   'x-component': 'Input',
                                 },
@@ -1953,7 +1953,7 @@ Table.Column.DesignableBar = () => {
                     });
                   }}
                 >
-                  修改列标题
+                  自定义列名称
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item
@@ -2018,7 +2018,7 @@ Table.DesignableBar = observer((props) => {
           <AddNew.CardItem defaultAction={'insertAfter'} ghost />
           <DragHandle />
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -2177,7 +2177,7 @@ Table.DesignableBar = observer((props) => {
                   key={'defaultFilter'}
                   onClick={async () => {
                     const { defaultFilter } = await FormDialog(
-                      '设置筛选范围',
+                      '设置数据范围',
                       () => {
                         return (
                           <FormLayout layout={'vertical'}>
@@ -2208,7 +2208,7 @@ Table.DesignableBar = observer((props) => {
                     await updateSchema(schema);
                   }}
                 >
-                  设置筛选范围
+                  设置数据范围
                 </Menu.Item>
                 <Menu.Item key={'defaultPageSize'}>
                   每页默认显示{' '}

packages/client/src/schemas/tabs/index.tsx

@@ -107,6 +107,7 @@ export const Tabs: any = observer((props: any) => {
             designable &&
             schema['x-designable-bar'] && (
               <Button
+                className={'designable-btn designable-btn-dash'}
                 type={'dashed'}
                 icon={<PlusOutlined />}
                 onClick={async () => {
@@ -221,7 +222,7 @@ Tabs.DesignableBar = () => {
       >
         <Space>
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             placement={'bottomRight'}
             onVisibleChange={(visible) => {
@@ -271,7 +272,7 @@ Tabs.TabPane.DesignableBar = () => {
         <Space>
           <DragHandle />{' '}
           <Dropdown
-            trigger={['click']}
+            trigger={['hover']}
             visible={visible}
             onVisibleChange={(visible) => {
               setVisible(visible);
@@ -280,7 +281,7 @@ Tabs.TabPane.DesignableBar = () => {
               <Menu>
                 <Menu.Item
                   onClick={async () => {
-                    const values = await FormDialog('修改名称和图标', () => {
+                    const values = await FormDialog('编辑按钮', () => {
                       return (
                         <FormLayout layout={'vertical'}>
                           <SchemaField
@@ -320,7 +321,7 @@ Tabs.TabPane.DesignableBar = () => {
                     updateSchema(schema);
                   }}
                 >
-                  修改名称和图标
+                  编辑按钮
                 </Menu.Item>
                 <Menu.Divider />
                 <Menu.Item

packages/client/src/schemas/tabs/style.less

@@ -18,6 +18,10 @@
     &.active {
       display: block;
     }
+    + .ant-tabs {
+      position: relative;
+      z-index: 51;
+    }
     .designable-bar-actions {
       pointer-events: all;
       position: absolute;