fix(mobile-client): fix multiple bugs and do some improvement (#2072)

2023-06-21 22:26:15 +08:00 · 2023-06-21 22:26:15 +08:00 · b80aaacb38
commit b80aaacb38
parent 6254fceb04
9 changed files with 103 additions and 103 deletions
--- a/packages/core/client/src/schema-component/antd/index.less
+++ b/packages/core/client/src/schema-component/antd/index.less
@ -42,7 +42,5 @@
 }

 html body {
-  --adm-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
-  Segoe UI Symbol;
+  --adm-font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
 }
--- a/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx
+++ b/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx
@ -2,45 +2,36 @@ import { css } from '@emotion/css';
 import { observer, RecursionField, useField, useFieldSchema } from '@formily/react';
 import { TabPaneProps, Tabs as AntdTabs, TabsProps } from 'antd';
 import classNames from 'classnames';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Icon } from '../../../icon';
 import { useSchemaInitializer } from '../../../schema-initializer';
 import { DndContext, SortableItem } from '../../common';
 import { useDesigner } from '../../hooks/useDesigner';
-import { TabsContextProvider, useTabsContext } from './context';
+import { useTabsContext } from './context';
 import { TabsDesigner } from './Tabs.Designer';
+import { useDesignable } from '../../hooks';

 export const Tabs: any = observer(
  (props: TabsProps) => {
    const fieldSchema = useFieldSchema();
    const { render } = useSchemaInitializer(fieldSchema['x-initializer']);
+    const { designable } = useDesignable();
    const contextProps = useTabsContext();
-
-    const PaneProvider = useMemo(() => {
-      if (contextProps.deep === false) {
-        return TabsContextProvider;
-      }
-      return React.Fragment;
-    }, [contextProps.deep]);
+    const { PaneRoot = React.Fragment as React.FC<any> } = contextProps;

    return (
      <DndContext>
-        <AntdTabs
-          {...contextProps}
-          style={props.style}
-          tabBarExtraContent={{
-            right: render(),
-          }}
-        >
+        <AntdTabs {...contextProps} style={props.style}>
          {fieldSchema.mapProperties((schema, key) => {
            return (
              <AntdTabs.TabPane tab={<RecursionField name={key} schema={schema} onlyRenderSelf />} key={key}>
-                <PaneProvider>
+                <PaneRoot active={key === contextProps.activeKey}>
                  <RecursionField name={key} schema={schema} onlyRenderProperties />
-                </PaneProvider>
+                </PaneRoot>
              </AntdTabs.TabPane>
            );
          })}
+          {designable && <AntdTabs.TabPane tab={render()} />}
        </AntdTabs>
      </DndContext>
    );
--- a/packages/core/client/src/schema-component/antd/tabs/context.tsx
+++ b/packages/core/client/src/schema-component/antd/tabs/context.tsx
@ -2,7 +2,7 @@ import { TabsProps } from 'antd';
 import React from 'react';

 interface TabsContextProps extends TabsProps {
-  deep?: boolean;
+  PaneRoot?: React.FC<any>;
 }
 const TabsContext = React.createContext<TabsContextProps>({});

--- a/packages/plugins/mobile-client/src/client/core/bridge/injects.ts
+++ b/packages/plugins/mobile-client/src/client/core/bridge/injects.ts
@ -3,12 +3,13 @@ interface InvokeFunction {
  (params: { action: 'moveTaskToBack' }, cb?: () => void): void;
 }

-const JsBridge = (window as any).JsBridge as {
+const getJsBridge = () =>
+  (window as any).JsBridge as {
    invoke: InvokeFunction;
  };

 export const invoke: InvokeFunction = (params, cb) => {
-  JsBridge.invoke(params, cb);
+  return getJsBridge().invoke(params, cb);
 };

-export const isJSBridge = !!JsBridge;
+export const isJSBridge = () => !!getJsBridge();
--- a/packages/plugins/mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx
+++ b/packages/plugins/mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx
@ -6,6 +6,7 @@ import React from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from '../../../../locale';
 import { useSchemaPatch } from '../../hooks';
+import { menuItemSchema } from './schema';

 interface MMenuItemProps extends ListItemProps {
  name: string;
@ -56,24 +57,7 @@ const MenuItemDesigner: React.FC = () => {
      <SchemaSettings.ModalItem
        title={t('Edit menu info')}
        initialValues={field.componentProps}
-        schema={{
-          properties: {
-            name: {
-              type: 'string',
-              title: t('Menu name'),
-              required: true,
-              'x-component': 'Input',
-              'x-decorator': 'FormItem',
-            },
-            icon: {
-              required: true,
-              'x-decorator': 'FormItem',
-              'x-component': 'IconPicker',
-              title: t('Icon'),
-              'x-component-props': {},
-            },
-          },
-        }}
+        schema={menuItemSchema}
        onSubmit={onUpdateComponentProps}
      />
      <SchemaSettings.Remove
--- a/packages/plugins/mobile-client/src/client/core/schema/components/menu/schema.ts
+++ b/packages/plugins/mobile-client/src/client/core/schema/components/menu/schema.ts
@ -1,8 +1,10 @@
+import { generateNTemplate } from '../../../../locale';
+
 export const menuItemSchema = {
  properties: {
    name: {
      type: 'string',
-      title: `{{t('Menu name')}}`,
+      title: generateNTemplate('Menu name'),
      required: true,
      'x-component': 'Input',
      'x-decorator': 'FormItem',
@ -10,7 +12,7 @@ export const menuItemSchema = {
    icon: {
      'x-decorator': 'FormItem',
      'x-component': 'IconPicker',
-      title: `{{t('Icon')}}`,
+      title: generateNTemplate('Icon'),
      'x-component-props': {},
    },
  },
--- a/packages/plugins/mobile-client/src/client/core/schema/components/page/Page.tsx
+++ b/packages/plugins/mobile-client/src/client/core/schema/components/page/Page.tsx
@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css';
 import { RecursionField, useFieldSchema } from '@formily/react';
 import { ActionBarProvider, SortableItem, TabsContextProvider, useDesigner } from '@nocobase/client';
 import { TabsProps } from 'antd';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { countGridCol } from '../../helpers';
 import { PageDesigner } from './Page.Designer';
@ -28,41 +28,57 @@ const InternalPage: React.FC = (props) => {
  // Only support globalActions in page
  const onlyInPage = fieldSchema.root === fieldSchema.parent;
  let hasGlobalActions = false;
-  if (!tabsSchema) {
+  if (!tabsSchema && fieldSchema.properties) {
    hasGlobalActions = countGridCol(fieldSchema.properties['grid'], 2) === 1;
-  } else if (searchParams.has('tab') && tabsSchema.properties?.[searchParams.get('tab')]) {
+  } else if (searchParams.has('tab') && tabsSchema?.properties?.[searchParams.get('tab')]) {
    hasGlobalActions = countGridCol(tabsSchema.properties[searchParams.get('tab')]?.properties?.['grid'], 2) === 1;
-  } else if (tabsSchema.properties) {
+  } else if (tabsSchema?.properties) {
    const schema = Object.values(tabsSchema.properties).sort((t1, t2) => t1['x-index'] - t2['x-index'])[0];
    if (schema) {
      setTimeout(() => {
-        setSearchParams([['tab', schema.name.toString()]]);
+        setSearchParams([['tab', schema.name.toString()]], {
+          replace: true,
+        });
      });
    }
  }

  const onTabsChange = useCallback<TabsProps['onChange']>(
    (key) => {
-      setSearchParams([['tab', key]]);
+      setSearchParams([['tab', key]], {
+        replace: true,
+      });
    },
    [setSearchParams],
  );

-  const GlobalActionProvider = useMemo(() => {
+  const GlobalActionProvider = useCallback(
+    (props) => {
      if (hasGlobalActions) {
-      return ActionBarProvider;
-    }
-    return (props) => <>{props.children}</>;
-  }, [hasGlobalActions]);
-
        return (
-    <GlobalActionProvider
-      container={hasGlobalActions && onlyInPage ? document.getElementById('nb-position-container') : null}
+          <TabsContextProvider>
+            <ActionBarProvider
+              container={
+                (typeof props.active !== 'undefined' ? props.active : true) && onlyInPage
+                  ? document.getElementById('nb-position-container')
+                  : null
+              }
              forceProps={{
                layout: 'one-column',
                className: globalActionCSS,
              }}
            >
+              {props.children}
+            </ActionBarProvider>
+          </TabsContextProvider>
+        );
+      }
+      return <>{props.children}</>;
+    },
+    [hasGlobalActions, onlyInPage],
+  );
+
+  return (
    <SortableItem
      eid="nb-mobile-scroll-wrapper"
      className={cx(
@ -88,8 +104,11 @@ const InternalPage: React.FC = (props) => {
          'nb-mobile-page-header',
          css`
            & > .ant-tabs > .ant-tabs-nav {
+              .ant-tabs-tab {
+                margin: 0 !important;
+                padding: 0 16px !important;
+              }
              background: #fff;
-                padding: 0 var(--nb-spacing);
            }
            display: flex;
            flex-direction: column;
@ -102,7 +121,11 @@ const InternalPage: React.FC = (props) => {
            return 'MHeader' === s['x-component'];
          }}
        ></RecursionField>
-          <TabsContextProvider deep={false} activeKey={searchParams.get('tab')} onChange={onTabsChange}>
+        <TabsContextProvider
+          PaneRoot={GlobalActionProvider}
+          activeKey={searchParams.get('tab')}
+          onChange={onTabsChange}
+        >
          <RecursionField
            schema={fieldSchema}
            filterProperties={(s) => {
@ -111,7 +134,7 @@ const InternalPage: React.FC = (props) => {
          ></RecursionField>
        </TabsContextProvider>
      </div>
-
+      <GlobalActionProvider>
        {!tabsSchema && (
          <RecursionField
            schema={fieldSchema}
@ -120,8 +143,8 @@ const InternalPage: React.FC = (props) => {
            }}
          ></RecursionField>
        )}
-      </SortableItem>
      </GlobalActionProvider>
+    </SortableItem>
  );
 };

--- a/packages/plugins/mobile-client/src/client/router/Application.tsx
+++ b/packages/plugins/mobile-client/src/client/router/Application.tsx
@ -115,6 +115,7 @@ const MApplication: React.FC = (props) => {
                {props.children}
              </RemoteSchemaComponent>
            )}
+            {/* Global action will insert here */}
            <div id="nb-position-container"></div>
          </div>
        </ActionContextProvider>
--- a/packages/plugins/mobile-client/src/client/router/RouteSwitchProvider.tsx
+++ b/packages/plugins/mobile-client/src/client/router/RouteSwitchProvider.tsx
@ -10,7 +10,7 @@ export const RouterSwitchProvider = (props) => {
  const location = useLocation();
  const navigate = useNavigate();
  useEffect(() => {
-    if (isJSBridge) {
+    if (isJSBridge()) {
      if (location.pathname.includes('/admin')) {
        navigate('/mobile');
      }