tntd 1.4.4 → 1.4.7

package/components/Layout/HeaderActions.js

@@ -1,16 +1,16 @@
-import styled, { withTheme } from 'styled-components';
-import { Divider } from 'antd';
-import GlobalNavigation from './GlobalNavigation';
-import Language from './Language';
-import Theme from './Theme';
-import LanguageTheme from './CompatibleLanguage';
-import Application from './Application';
-import Avatar from './Avatar';
+import styled, { withTheme } from "styled-components";
+import { Divider } from "antd";
+import GlobalNavigation from "./GlobalNavigation";
+import Language from "./Language";
+import Theme from "./Theme";
+import LanguageTheme from "./CompatibleLanguage";
+import Application from "./Application";
+import Avatar from "./Avatar";
 
 const Actions = styled.ul`
     list-style: none;
     display: inline-block;
-    line-height: ${props => `${props.theme.headerHeight}px`};
+    line-height: ${(props) => `${props.theme.headerHeight}px`};
     margin: 0 0 0 20px;
     .hasHeaderTabs & {
         margin: 0;
@@ -29,7 +29,7 @@ const Actions = styled.ul`
         cursor: pointer;
         font-size: 20px;
         margin: 0 7.5px;
-        color: ${props => `${props.theme.headerActionsColor}`};
+        color: ${(props) => `${props.theme.headerActionsColor}`};
         .large-size & {
             margin: 0 10px;
         }
@@ -39,7 +39,7 @@ const Actions = styled.ul`
         &:last-of-type {
             margin-right: 0;
         }
-        .hasHeaderTabs &{
+        .hasHeaderTabs & {
             color: #455064;
         }
         // 删除色系区分 统一色调
@@ -52,123 +52,85 @@ const Actions = styled.ul`
     }
 `;
 
-export default withTheme(
-    props => {
-        const {
-            config: {
-                theme = true,
-                avatar = true,
-                language = true,
-                application = false,
-                globalNavigation = false
-            } = {},
-            theme: {
-                compatible
-            },
-            userInfo = {},
-            menus,
-            apps,
-            extraActions,
-            headerRef,
-            onLanguageChange,
-            onThemeChange,
-            onApplicationChange,
-            onAppChange,
-            onCollapseChange,
-            onPersonalSetting,
-            onChangePassword,
-            onLogout,
-            onLogoClick,
-            AvatarCustom,
-            ...rest
-        } = props;
+export default withTheme((props) => {
+    const {
+        config: {
+            theme = true,
+            avatar = true,
+            language = true,
+            application = false,
+            globalNavigation = false,
+        } = {},
+        theme: { compatible },
+        userInfo = {},
+        menus,
+        apps,
+        extraActions,
+        headerRef,
+        onLanguageChange,
+        onThemeChange,
+        onApplicationChange,
+        onAppChange,
+        onCollapseChange,
+        onPersonalSetting,
+        onChangePassword,
+        onLogout,
+        onLogoClick,
+        AvatarCustom,
+        ...rest
+    } = props;
 
-        return (
-            <Actions {...rest}>
-                {extraActions}
-                {
-                    globalNavigation && (
-                        <GlobalNavigation
-                            headerRef={headerRef}
-                            menus={menus}
+    return (
+        <Actions {...rest}>
+            {extraActions}
+            {globalNavigation && <GlobalNavigation headerRef={headerRef} menus={menus} />}
+            {!compatible ? (
+                <>
+                    {language && <Language language={userInfo.lang} onChange={onLanguageChange} />}
+                    {theme && <Theme theme={userInfo.theme} onChange={onThemeChange} />}
+                </>
+            ) : (
+                <LanguageTheme
+                    config={props.config}
+                    language={userInfo.lang}
+                    theme={userInfo.theme}
+                    onLanguageChange={onLanguageChange}
+                    onThemeChange={onThemeChange}
+                />
+            )}
+            {application && (
+                <Application language={userInfo.lang} apps={apps} onChange={onApplicationChange} />
+            )}
+            {avatar && (
+                <>
+                    <Divider type="vertical" />
+                    {AvatarCustom ? (
+                        <AvatarCustom
+                            userInfo={userInfo}
+                            onPersonalSetting={onPersonalSetting}
+                            onChangePassword={onChangePassword}
+                            onLogout={onLogout}
+                            onThemeChange={onThemeChange}
+                            config={{
+                                theme,
+                                language,
+                            }}
                         />
-                    )
-                }
-                {
-                    !AvatarCustom &&
-                    (
-                        !compatible ? (
-                            <>
-                                {
-                                    language && (
-                                        <Language
-                                            language={userInfo.lang}
-                                            onChange={onLanguageChange}
-                                        />
-                                    )
-                                }
-                                {
-                                    theme && (
-                                        <Theme
-                                            theme={userInfo.theme}
-                                            onChange={onThemeChange}
-                                        />
-                                    )
-                                }
-                            </>
-                        ) : (
-                            <LanguageTheme
-                                config={props.config}
-                                language={userInfo.lang}
-                                theme={userInfo.theme}
-                                onLanguageChange={onLanguageChange}
-                                onThemeChange={onThemeChange}
-                            />
-                        )
-                    )
-                }
-                {
-                    application && (
-                        <Application
-                            language={userInfo.lang}
-                            apps={apps}
-                            onChange={onApplicationChange}
+                    ) : (
+                        <Avatar
+                            userInfo={userInfo}
+                            onPersonalSetting={onPersonalSetting}
+                            onChangePassword={onChangePassword}
+                            onLogout={onLogout}
+                            onThemeChange={onThemeChange}
+                            config={{
+                                theme,
+                                language,
+                            }}
                         />
-                    )
-                }
-                {
-                    avatar && (
-                        <>
-                            <Divider type="vertical" />
-                            {
-                                AvatarCustom ?
-                                    <AvatarCustom
-                                        userInfo={userInfo}
-                                        onPersonalSetting={onPersonalSetting}
-                                        onChangePassword={onChangePassword}
-                                        onLogout={onLogout}
-                                        onThemeChange={onThemeChange}
-                                        config={{
-                                            theme,
-                                            language
-                                        }}
-                                    /> :
-                                    <Avatar
-                                        userInfo={userInfo}
-                                        onPersonalSetting={onPersonalSetting}
-                                        onChangePassword={onChangePassword}
-                                        onLogout={onLogout}
-                                        onThemeChange={onThemeChange}
-                                        config={{
-                                            theme,
-                                            language
-                                        }}
-                                    />
-                            }
-                        </>
-                    )
-                }
-            </Actions>
-        );
-    }
-);
+                    )}
+                </>
+            )}
+        </Actions>
+    );
+});

package/components/LoadingButton/index.js

@@ -1,30 +1,26 @@
-import { useState, useEffect } from 'react';
-import { Button } from 'antd';
+import { useState, useEffect } from "react";
+import { Button } from "antd";
 
-export default props => {
-    const [loading, setLoading] = useState(props.loading);
-    const onClick = evt => {
+export default ({ loadingText, loading: pLoading, onClick, children, ...otherProps }) => {
+    const [loading, setLoading] = useState(pLoading);
+    const doClick = (evt) => {
         if (!loading) {
             setLoading(true);
-            const returnVal = props.onClick && props.onClick(evt, () => setLoading(false));
+            const returnVal = onClick && onClick(evt, () => setLoading(false));
 
             if (returnVal instanceof Promise) {
-                returnVal.then(
-                    () => setLoading(false)
-                ).catch(
-                    () => setLoading(false)
-                );
+                returnVal.then(() => setLoading(false)).catch(() => setLoading(false));
             }
         }
     };
 
     useEffect(() => {
-        setLoading(props.loading);
-    }, [props.loading]);
+        setLoading(pLoading);
+    }, [pLoading]);
 
     return (
-        <Button {...props} loading={loading} onClick={onClick}>
-            {loading ? (props.loadingText || props.children) : props.children}
+        <Button {...otherProps} loading={loading} onClick={doClick}>
+            {loading ? loadingText || children : children}
         </Button>
     );
 };

package/components/QueryListScene/QueryForm.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import classnames from 'classnames';
-import Form from '../QueryForm'; 
+import Form from '../QueryForm';
 
 const clsPrefix = 'tnt-querylistscene-queryform';
- 
+
 export default class QueryForm extends React.PureComponent {
     constructor(props) {
         super(props);
@@ -60,9 +60,12 @@ export default class QueryForm extends React.PureComponent {
         const values = actions.getFormData();
         const params = { ...values, current: 1 };
 
+        // memory 与 url解析setForm时 监听事件异步
         actions.setData('formData', values);
-        onSearch && onSearch(params);
-        actions.emit('search', params);
+        Promise.resolve().then(()=>{
+            onSearch && onSearch(params);
+            actions.emit('search', params);
+        });
     };
 
     onReset = () => {