feffery_antd_components 0.3.15 → 0.4.0-rc5

package/src/lib/components/general/typography/AntdText.react.js

@@ -7,7 +7,7 @@ import { Typography, ConfigProvider } from 'antd';
 import { str2Locale } from '../../locales.react';
 import { isString } from 'lodash';
 import { pickBy } from 'ramda';
-import { parseChildrenToArray } from '../../utils';
+import { parseChildrenToArray, useLoading } from '../../utils';
 // 自定义hooks
 import useCss from '../../../hooks/useCss';
 // 自定义上下文
@@ -18,28 +18,27 @@ const { Text } = Typography;
 /**
  * 文字组件AntdText
  */
-const AntdText = (props) => {
-    let {
-        id,
-        children,
-        className,
-        style,
-        key,
-        locale,
-        code,
-        copyable,
-        strikethrough,
-        disabled,
-        mark,
-        strong,
-        italic,
-        underline,
-        type,
-        keyboard,
-        ellipsis,
-        setProps,
-        loading_state
-    } = props;
+const AntdText = ({
+    id,
+    children,
+    className,
+    style,
+    key,
+    locale = 'zh-cn',
+    code,
+    copyable,
+    strikethrough,
+    disabled,
+    mark,
+    strong,
+    italic,
+    underline,
+    type,
+    keyboard,
+    ellipsis = false,
+    setProps,
+    ...others
+}) => {
 
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
@@ -50,7 +49,7 @@ const AntdText = (props) => {
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Text
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                 id={id}
                 className={
                     isString(className) ?
@@ -70,9 +69,7 @@ const AntdText = (props) => {
                 type={type}
                 keyboard={keyboard}
                 ellipsis={ellipsis}
-                data-dash-is-loading={
-                    (loading_state && loading_state.is_loading) || undefined
-                }>
+                data-dash-is-loading={useLoading()}>
                 {children}
             </Text>
         </ConfigProvider>
@@ -109,10 +106,10 @@ AntdText.propTypes = {
     ]),
 
     /**
-     * 组件文案语种，可选项有`'zh-cn'`（简体中文）、`'en-us'`（英语）、`'de-de'`（德语）
+     * 组件文案语种，可选项有`'zh-cn'`（简体中文）、`'en-us'`（英语）、`'de-de'`（德语）、`'ru-ru'`（俄语）
      * 默认值：`'zh-cn'`
      */
-    locale: PropTypes.oneOf(['zh-cn', 'en-us', 'de-de']),
+    locale: PropTypes.oneOf(['zh-cn', 'en-us', 'de-de', 'ru-ru']),
 
     /**
      * 是否渲染为代码形式
@@ -188,21 +185,6 @@ AntdText.propTypes = {
      */
     'aria-*': PropTypes.string,
 
-    loading_state: PropTypes.shape({
-        /**
-         * Determines if the component is loading or not
-         */
-        is_loading: PropTypes.bool,
-        /**
-         * Holds which property is loading
-         */
-        prop_name: PropTypes.string,
-        /**
-         * Holds the name of the component that is loading
-         */
-        component_name: PropTypes.string
-    }),
-
     /**
      * Dash-assigned callback that should be called to report property changes
      * to Dash, to make them available for callbacks.
@@ -210,10 +192,4 @@ AntdText.propTypes = {
     setProps: PropTypes.func
 };
 
-// 设置默认参数
-AntdText.defaultProps = {
-    ellipsis: false,
-    locale: 'zh-cn'
-}
-
 export default AntdText;

package/src/lib/components/general/typography/AntdTitle.react.js

@@ -7,7 +7,7 @@ import { Typography, ConfigProvider } from 'antd';
 import { isString } from 'lodash';
 import { pickBy } from 'ramda';
 import { str2Locale } from '../../locales.react';
-import { parseChildrenToArray } from '../../utils';
+import { parseChildrenToArray, useLoading } from '../../utils';
 // 自定义hooks
 import useCss from '../../../hooks/useCss';
 // 自定义上下文
@@ -18,28 +18,27 @@ const { Title } = Typography;
 /**
  * 标题组件AntdTitle
  */
-const AntdTitle = (props) => {
-    let {
-        id,
-        children,
-        className,
-        style,
-        key,
-        locale,
-        level,
-        code,
-        copyable,
-        strikethrough,
-        disabled,
-        mark,
-        strong,
-        italic,
-        underline,
-        type,
-        keyboard,
-        setProps,
-        loading_state
-    } = props;
+const AntdTitle = ({
+    id,
+    children,
+    className,
+    style,
+    key,
+    locale = 'zh-cn',
+    level = 1,
+    code,
+    copyable,
+    strikethrough,
+    disabled,
+    mark,
+    strong,
+    italic,
+    underline,
+    type,
+    keyboard,
+    setProps,
+    ...others
+}) => {
 
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
@@ -50,7 +49,7 @@ const AntdTitle = (props) => {
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Title
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                 id={id}
                 className={
                     isString(className) ?
@@ -70,16 +69,13 @@ const AntdTitle = (props) => {
                 underline={underline}
                 type={type}
                 keyboard={keyboard}
-                data-dash-is-loading={
-                    (loading_state && loading_state.is_loading) || undefined
-                }>
+                data-dash-is-loading={useLoading()}>
                 {children}
             </Title>
         </ConfigProvider>
     );
 }
 
-// 定义参数或属性
 AntdTitle.propTypes = {
     /**
       * 组件唯一id
@@ -110,10 +106,10 @@ AntdTitle.propTypes = {
     ]),
 
     /**
-     * 组件文案语种，可选项有`'zh-cn'`（简体中文）、`'en-us'`（英语）、`'de-de'`（德语）
+     * 组件文案语种，可选项有`'zh-cn'`（简体中文）、`'en-us'`（英语）、`'de-de'`（德语）、`'ru-ru'`（俄语）
      * 默认值：`'zh-cn'`
      */
-    locale: PropTypes.oneOf(['zh-cn', 'en-us', 'de-de']),
+    locale: PropTypes.oneOf(['zh-cn', 'en-us', 'de-de', 'ru-ru']),
 
     /**
      * 标题级别，可选项有`1`、`2`、`3`、`4`、`5`
@@ -181,21 +177,6 @@ AntdTitle.propTypes = {
      */
     'aria-*': PropTypes.string,
 
-    loading_state: PropTypes.shape({
-        /**
-         * Determines if the component is loading or not
-         */
-        is_loading: PropTypes.bool,
-        /**
-         * Holds which property is loading
-         */
-        prop_name: PropTypes.string,
-        /**
-         * Holds the name of the component that is loading
-         */
-        component_name: PropTypes.string
-    }),
-
     /**
      * Dash-assigned callback that should be called to report property changes
      * to Dash, to make them available for callbacks.
@@ -203,10 +184,4 @@ AntdTitle.propTypes = {
     setProps: PropTypes.func
 };
 
-// 设置默认参数
-AntdTitle.defaultProps = {
-    locale: 'zh-cn',
-    level: 1
-}
-
 export default AntdTitle;

package/src/lib/components/icons.react.js

@@ -181,6 +181,16 @@ import {
     WeiboCircleOutlined,
     AlipayOutlined,
     AlipayCircleOutlined,
+    AndroidOutlined,
+    AppleOutlined,
+    WechatOutlined,
+    WechatWorkOutlined,
+    OpenAIOutlined,
+    BilibiliOutlined,
+    TikTokOutlined,
+    JavaScriptOutlined,
+    PythonOutlined,
+    DockerOutlined,
     AccountBookOutlined,
     AlertOutlined,
     ApiOutlined,
@@ -250,7 +260,9 @@ import {
     StepBackwardOutlined,
     StepForwardOutlined,
     FastForwardOutlined,
-    FastBackwardOutlined
+    FastBackwardOutlined,
+    SunOutlined,
+    MoonOutlined
 } from '@ant-design/icons';
 import {
     BsAlarm,
@@ -616,6 +628,16 @@ const str2Icon = new Map([
     ['antd-alipay-circle', <AlipayCircleOutlined />],
     ['antd-weibo', <WeiboCircleOutlined />],
     ['antd-github', <GithubOutlined />],
+    ['antd-android', <AndroidOutlined />],
+    ['antd-apple', <AppleOutlined />],
+    ['antd-wechat', <WechatOutlined />],
+    ['antd-wechat-work', <WechatWorkOutlined />],
+    ['antd-openai', <OpenAIOutlined />],
+    ['antd-bilibili', <BilibiliOutlined />],
+    ['antd-tiktok', <TikTokOutlined />],
+    ['antd-javascript', <JavaScriptOutlined />],
+    ['antd-python', <PythonOutlined />],
+    ['antd-docker', <DockerOutlined />],
     ['antd-fall', <FallOutlined />],
     ['antd-rise', <RiseOutlined />],
     ['antd-stock', <StockOutlined />],
@@ -814,6 +836,8 @@ const str2Icon = new Map([
     ['antd-step-forward', <StepForwardOutlined />],
     ['antd-fast-forward', <FastForwardOutlined />],
     ['antd-fast-backward', <FastBackwardOutlined />],
+    ['antd-sun', <SunOutlined />],
+    ['antd-moon', <MoonOutlined />],
     ['md-star-half', <MdStarHalf />],
     ['md-star-border', <MdStarBorder />],
     ['md-star', <MdStar />],

package/src/lib/components/layout/AntdCenter.react.js

@@ -5,7 +5,7 @@ import { theme } from 'antd';
 // 辅助库
 import { isString } from 'lodash';
 import { pickBy } from 'ramda';
-import { parseChildrenToArray } from '../utils';
+import { parseChildrenToArray, useLoading } from '../utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 
@@ -14,18 +14,17 @@ const { useToken } = theme;
 /**
  * 居中组件AntdCenter
  */
-const AntdCenter = (props) => {
-    let {
-        id,
-        children,
-        className,
-        style,
-        key,
-        inline,
-        inheritStyleToken,
-        setProps,
-        loading_state
-    } = props;
+const AntdCenter = ({
+    id,
+    children,
+    className,
+    style,
+    key,
+    inline = false,
+    inheritStyleToken = false,
+    setProps,
+    ...others
+}) => {
 
     const { token } = useToken();
 
@@ -34,7 +33,7 @@ const AntdCenter = (props) => {
     return (
         <div
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -57,9 +56,7 @@ const AntdCenter = (props) => {
                 ...style
             }}
             key={key}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }>
+            data-dash-is-loading={useLoading()}>
             {children}
         </div>
     );
@@ -116,21 +113,6 @@ AntdCenter.propTypes = {
      */
     'aria-*': PropTypes.string,
 
-    loading_state: PropTypes.shape({
-        /**
-         * Determines if the component is loading or not
-         */
-        is_loading: PropTypes.bool,
-        /**
-         * Holds which property is loading
-         */
-        prop_name: PropTypes.string,
-        /**
-         * Holds the name of the component that is loading
-         */
-        component_name: PropTypes.string
-    }),
-
     /**
      * Dash-assigned callback that should be called to report property changes
      * to Dash, to make them available for callbacks.
@@ -138,10 +120,4 @@ AntdCenter.propTypes = {
     setProps: PropTypes.func
 };
 
-// 设置默认参数
-AntdCenter.defaultProps = {
-    inline: false,
-    inheritStyleToken: false
-}
-
 export default AntdCenter;

package/src/lib/components/layout/AntdCompact.react.js

@@ -5,7 +5,7 @@ import { Space } from 'antd';
 // 辅助库
 import { isString } from 'lodash';
 import { pickBy } from 'ramda';
-import { parseChildrenToArray } from '../utils';
+import { parseChildrenToArray, useLoading } from '../utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 
@@ -14,25 +14,24 @@ const { Compact } = Space;
 /**
  * 紧凑排列组件AntdCompact
  */
-const AntdCompact = (props) => {
-    let {
-        id,
-        children,
-        className,
-        style,
-        key,
-        direction,
-        block,
-        setProps,
-        loading_state
-    } = props;
+const AntdCompact = ({
+    id,
+    children,
+    className,
+    style,
+    key,
+    direction = 'horizontal',
+    block = false,
+    setProps,
+    ...others
+}) => {
 
     children = parseChildrenToArray(children)
 
     return (
         <Compact
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -43,9 +42,7 @@ const AntdCompact = (props) => {
             key={key}
             direction={direction}
             block={block}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }>
+            data-dash-is-loading={useLoading()}>
             {children}
         </Compact>
     );
@@ -102,21 +99,6 @@ AntdCompact.propTypes = {
      */
     'aria-*': PropTypes.string,
 
-    loading_state: PropTypes.shape({
-        /**
-         * Determines if the component is loading or not
-         */
-        is_loading: PropTypes.bool,
-        /**
-         * Holds which property is loading
-         */
-        prop_name: PropTypes.string,
-        /**
-         * Holds the name of the component that is loading
-         */
-        component_name: PropTypes.string
-    }),
-
     /**
      * Dash-assigned callback that should be called to report property changes
      * to Dash, to make them available for callbacks.
@@ -124,10 +106,4 @@ AntdCompact.propTypes = {
     setProps: PropTypes.func
 };
 
-// 设置默认参数
-AntdCompact.defaultProps = {
-    direction: 'horizontal',
-    block: false
-}
-
 export default AntdCompact;

package/src/lib/components/layout/AntdContent.react.js

@@ -5,7 +5,7 @@ import { Layout } from 'antd';
 // 辅助库
 import { isString } from 'lodash';
 import { pickBy } from 'ramda';
-import { parseChildrenToArray } from '../utils';
+import { parseChildrenToArray, useLoading } from '../utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 
@@ -14,23 +14,22 @@ const { Content } = Layout;
 /**
  * 内容区组件AntdContent
  */
-const AntdContent = (props) => {
-    let {
-        id,
-        children,
-        className,
-        style,
-        key,
-        setProps,
-        loading_state
-    } = props;
+const AntdContent = ({
+    id,
+    children,
+    className,
+    style,
+    key,
+    setProps,
+    ...others
+}) => {
 
     children = parseChildrenToArray(children)
 
     return (
         <Content
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -39,9 +38,7 @@ const AntdContent = (props) => {
             }
             style={style}
             key={key}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }>
+            data-dash-is-loading={useLoading()}>
             {children}
         </Content>
     );
@@ -86,21 +83,6 @@ AntdContent.propTypes = {
      */
     'aria-*': PropTypes.string,
 
-    loading_state: PropTypes.shape({
-        /**
-         * Determines if the component is loading or not
-         */
-        is_loading: PropTypes.bool,
-        /**
-         * Holds which property is loading
-         */
-        prop_name: PropTypes.string,
-        /**
-         * Holds the name of the component that is loading
-         */
-        component_name: PropTypes.string
-    }),
-
     /**
      * Dash-assigned callback that should be called to report property changes
      * to Dash, to make them available for callbacks.
@@ -108,8 +90,4 @@ AntdContent.propTypes = {
     setProps: PropTypes.func
 };
 
-// 设置默认参数
-AntdContent.defaultProps = {
-}
-
 export default AntdContent;