feffery_utils_components 0.0.5 → 0.0.6

package/feffery_utils_components/feffery_utils_components.min.js.LICENSE.txt

@@ -1,3 +1,6 @@
+/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
+ * @license MIT */
+
 /*!
   Copyright (c) 2018 Jed Watson.
   Licensed under the MIT License (MIT), see

package/feffery_utils_components/metadata.json

@@ -291,6 +291,175 @@
       }
     }
   },
+  "src/lib/components/FefferyTopProgress.react.js": {
+    "description": "",
+    "displayName": "FefferyTopProgress",
+    "methods": [],
+    "props": {
+      "id": {
+        "type": {
+          "name": "string"
+        },
+        "required": false,
+        "description": ""
+      },
+      "children": {
+        "type": {
+          "name": "node"
+        },
+        "required": false,
+        "description": "The content of the tab - will only be displayed if this tab is selected"
+      },
+      "className": {
+        "type": {
+          "name": "string"
+        },
+        "required": false,
+        "description": ""
+      },
+      "style": {
+        "type": {
+          "name": "object"
+        },
+        "required": false,
+        "description": ""
+      },
+      "spinning": {
+        "type": {
+          "name": "bool"
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "false",
+          "computed": false
+        }
+      },
+      "minimum": {
+        "type": {
+          "name": "number"
+        },
+        "required": false,
+        "description": ""
+      },
+      "easing": {
+        "type": {
+          "name": "string"
+        },
+        "required": false,
+        "description": ""
+      },
+      "speed": {
+        "type": {
+          "name": "number"
+        },
+        "required": false,
+        "description": ""
+      },
+      "showSpinner": {
+        "type": {
+          "name": "bool"
+        },
+        "required": false,
+        "description": ""
+      },
+      "debug": {
+        "type": {
+          "name": "bool"
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "false",
+          "computed": false
+        }
+      },
+      "listenPropsMode": {
+        "type": {
+          "name": "enum",
+          "value": [
+            {
+              "value": "'default'",
+              "computed": false
+            },
+            {
+              "value": "'exclude'",
+              "computed": false
+            },
+            {
+              "value": "'include'",
+              "computed": false
+            }
+          ]
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "'default'",
+          "computed": false
+        }
+      },
+      "excludeProps": {
+        "type": {
+          "name": "arrayOf",
+          "value": {
+            "name": "string"
+          }
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "[]",
+          "computed": false
+        }
+      },
+      "includeProps": {
+        "type": {
+          "name": "arrayOf",
+          "value": {
+            "name": "string"
+          }
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "[]",
+          "computed": false
+        }
+      },
+      "loading_state": {
+        "type": {
+          "name": "shape",
+          "value": {
+            "is_loading": {
+              "name": "bool",
+              "description": "Determines if the component is loading or not",
+              "required": false
+            },
+            "prop_name": {
+              "name": "string",
+              "description": "Holds which property is loading",
+              "required": false
+            },
+            "component_name": {
+              "name": "string",
+              "description": "Holds the name of the component that is loading",
+              "required": false
+            }
+          }
+        },
+        "required": false,
+        "description": ""
+      },
+      "setProps": {
+        "type": {
+          "name": "func"
+        },
+        "required": false,
+        "description": "Dash-assigned callback that should be called to report property changes\r\nto Dash, to make them available for callbacks."
+      }
+    }
+  },
   "src/lib/components/FefferyWaterMark.react.js": {
     "description": "",
     "displayName": "FefferyWaterMark",

package/feffery_utils_components/package-info.json

@@ -1,6 +1,6 @@
 {
   "name": "feffery_utils_components",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Utility augments components of Dash!",
   "repository": {
     "type": "git",
@@ -13,8 +13,6 @@
   "main": "build/index.js",
   "scripts": {
     "start": "webpack-serve --config ./webpack.serve.config.js --open",
-    "validate-init": "python _validate_init.py",
-    "prepublishOnly": "npm run validate-init",
     "build:js": "webpack --mode production",
     "build:backends": "dash-generate-components ./src/lib/components feffery_utils_components -p package-info.json --r-prefix '' --jl-prefix ''",
     "build:backends-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:py_and_r)",
@@ -29,6 +27,7 @@
     "github-markdown-css": "^5.0.0",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
+    "nprogress": "^0.2.0",
     "ramda": "^0.26.1",
     "react-captcha-code": "^1.0.7",
     "react-contexify": "^5.0.0",
@@ -77,4 +76,4 @@
     "node": ">=8.11.0",
     "npm": ">=6.1.0"
   }
-}
+}

package/git-operations.md

@@ -0,0 +1,23 @@
+### 清除仓库主要文件的历史提交冗余空间
+
+- 查看历史大文件
+
+```bash
+git rev-list --objects --all | grep "$(git verify-pack -v .git/objects/pack/*.idx | sort -k 3 -n | tail -5 | awk '{print$1}')"
+```
+
+- 清除指定大文件
+
+```bash
+git filter-branch --force --index-filter 'git rm -rf --cached --ignore-unmatch feffery_utils_components/feffery_utils_components.min.js' --prune-empty --tag-name-filter cat -- --all
+
+git filter-branch --force --index-filter 'git rm -rf --cached --ignore-unmatch feffery_utils_components/metadata.json' --prune-empty --tag-name-filter cat -- --all
+
+git push origin main --force
+
+rm -rf .git/refs/original/
+
+git reflog expire --expire=now --all
+
+git gc --prune=now
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feffery_utils_components",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Utility augments components of Dash!",
   "repository": {
     "type": "git",
@@ -27,6 +27,7 @@
     "github-markdown-css": "^5.0.0",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
+    "nprogress": "^0.2.0",
     "ramda": "^0.26.1",
     "react-captcha-code": "^1.0.7",
     "react-contexify": "^5.0.0",
@@ -75,4 +76,4 @@
     "node": ">=8.11.0",
     "npm": ">=6.1.0"
   }
-}
+}

package/src/FefferyUtilsComponents.jl

@@ -3,11 +3,12 @@ module FefferyUtilsComponents
 using Dash
 
 const resources_path = realpath(joinpath( @__DIR__, "..", "deps"))
-const version = "0.0.5"
+const version = "0.0.6"
 
 include("jl/''_fefferycaptcha.jl")
 include("jl/''_fefferypasteimage.jl")
 include("jl/''_fefferysyntaxhighlighter.jl")
+include("jl/''_fefferytopprogress.jl")
 include("jl/''_fefferywatermark.jl")
 
 function __init__()
@@ -19,14 +20,14 @@ function __init__()
             [
                 DashBase.Resource(
     relative_package_path = "feffery_utils_components.min.js",
-    external_url = "https://unpkg.com/feffery_utils_components@0.0.5/feffery_utils_components/feffery_utils_components.min.js",
+    external_url = "https://unpkg.com/feffery_utils_components@0.0.6/feffery_utils_components/feffery_utils_components.min.js",
     dynamic = nothing,
     async = nothing,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "feffery_utils_components.min.js.map",
-    external_url = "https://unpkg.com/feffery_utils_components@0.0.5/feffery_utils_components/feffery_utils_components.min.js.map",
+    external_url = "https://unpkg.com/feffery_utils_components@0.0.6/feffery_utils_components/feffery_utils_components.min.js.map",
     dynamic = true,
     async = nothing,
     type = :js

package/src/jl/''_fefferytopprogress.jl

@@ -0,0 +1,41 @@
+# AUTO GENERATED FILE - DO NOT EDIT
+
+export ''_fefferytopprogress
+
+"""
+    ''_fefferytopprogress(;kwargs...)
+    ''_fefferytopprogress(children::Any;kwargs...)
+    ''_fefferytopprogress(children_maker::Function;kwargs...)
+
+
+A FefferyTopProgress component.
+
+Keyword arguments:
+- `children` (a list of or a singular dash component, string or number; optional): The content of the tab - will only be displayed if this tab is selected
+- `id` (String; optional)
+- `className` (String; optional)
+- `debug` (Bool; optional)
+- `easing` (String; optional)
+- `excludeProps` (Array of Strings; optional)
+- `includeProps` (Array of Strings; optional)
+- `listenPropsMode` (a value equal to: 'default', 'exclude', 'include'; optional)
+- `loading_state` (optional): . loading_state has the following type: lists containing elements 'is_loading', 'prop_name', 'component_name'.
+Those elements have the following types:
+  - `is_loading` (Bool; optional): Determines if the component is loading or not
+  - `prop_name` (String; optional): Holds which property is loading
+  - `component_name` (String; optional): Holds the name of the component that is loading
+- `minimum` (Real; optional)
+- `showSpinner` (Bool; optional)
+- `speed` (Real; optional)
+- `spinning` (Bool; optional)
+- `style` (Dict; optional)
+"""
+function ''_fefferytopprogress(; kwargs...)
+        available_props = Symbol[:children, :id, :className, :debug, :easing, :excludeProps, :includeProps, :listenPropsMode, :loading_state, :minimum, :showSpinner, :speed, :spinning, :style]
+        wild_props = Symbol[]
+        return Component("''_fefferytopprogress", "FefferyTopProgress", "feffery_utils_components", available_props, wild_props; kwargs...)
+end
+
+''_fefferytopprogress(children::Any; kwargs...) = ''_fefferytopprogress(;kwargs..., children = children)
+''_fefferytopprogress(children_maker::Function; kwargs...) = ''_fefferytopprogress(children_maker(); kwargs...)
+

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

@@ -0,0 +1,180 @@
+import React, { useState, useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+
+
+const parseChildrenToArray = children => {
+    if (children && !Array.isArray(children)) {
+        return [children];
+    }
+    return children;
+};
+
+// 定义顶部加载进度条组件FefferyTopProgress，api参数参考https://github.com/rstacruz/nprogress
+const FefferyTopProgress = (props) => {
+    // 取得必要属性或参数
+    let {
+        id,
+        className,
+        style,
+        children,
+        minimum,
+        easing,
+        speed,
+        showSpinner,
+        spinning,
+        loading_state,
+        listenPropsMode,
+        excludeProps,
+        includeProps,
+        debug,
+        setProps
+    } = props;
+
+    // 配置NProgress参数信息
+    NProgress.configure({
+        minimum,
+        easing,
+        speed,
+        showSpinner
+    })
+
+    children = parseChildrenToArray(children)
+
+    const [showSpinning, setShowSpinning] = useState(spinning);
+    const timer = useRef();
+
+    useEffect(() => {
+        if (loading_state) {
+            if (timer.current) {
+                clearTimeout(timer.current);
+            }
+            if (loading_state.is_loading && !showSpinning) {
+                // 当listenPropsMode为'default'时
+                if (listenPropsMode === 'default') {
+                    if (debug) {
+                        console.log(loading_state.component_name + '.' + loading_state.prop_name)
+                    }
+                    setShowSpinning(true);
+                    NProgress.start();
+                } else if (listenPropsMode === 'exclude') {
+                    // 当listenPropsMode为'exclude'模式时
+                    // 当前触发loading_state的组件+属性组合不在排除列表中时，激活动画
+                    if (excludeProps.indexOf(loading_state.component_name + '.' + loading_state.prop_name) === -1) {
+                        if (debug) {
+                            console.log(loading_state.component_name + '.' + loading_state.prop_name)
+                        }
+                        setShowSpinning(true);
+                        NProgress.start();
+                    }
+                } else if (listenPropsMode === 'include') {
+                    // 当listenPropsMode为'include'模式时
+                    // 当前触发loading_state的组件+属性组合在包含列表中时，激活动画
+                    if (includeProps.indexOf(loading_state.component_name + '.' + loading_state.prop_name) !== -1) {
+                        if (debug) {
+                            console.log(loading_state.component_name + '.' + loading_state.prop_name)
+                        }
+                        setShowSpinning(true);
+                        NProgress.start();
+                    }
+                }
+
+            } else if (!loading_state.is_loading && showSpinning) {
+                timer.current = setTimeout(() => {
+                    setShowSpinning(false);
+                    NProgress.done();
+                });
+            }
+        }
+    }, [loading_state]);
+
+    // 返回定制化的前端组件
+    return (<div id={id}
+        className={className}
+        style={style}
+        data-dash-is-loading={
+            (loading_state && loading_state.is_loading) || undefined
+        } > {children} </div>
+    );
+}
+
+FefferyTopProgress._dashprivate_isLoadingComponent = true;
+
+// 定义参数或属性
+FefferyTopProgress.propTypes = {
+    // 组件id
+    id: PropTypes.string,
+
+    /**
+     * The content of the tab - will only be displayed if this tab is selected
+     */
+    children: PropTypes.node,
+
+    // css类名
+    className: PropTypes.string,
+
+    // 自定义css字典
+    style: PropTypes.object,
+
+    // 设置是否处于加载中状态
+    spinning: PropTypes.bool,
+
+    // 设置顶端进度条的初始进度值，默认为0.08，取值在0到1之间
+    minimum: PropTypes.number,
+
+    // 用于设置同名css动画效果，默认为'ease'
+    easing: PropTypes.string,
+
+    // 设置进度条每步递增耗时（单位：毫秒），默认为200
+    speed: PropTypes.number,
+
+    // 设置是否渲染右上角圆圈加载动画，默认为true
+    showSpinner: PropTypes.bool,
+
+    // 设置是否开启debug模式，开启后，每次动画加载都会在开发者工具的控制台打印prop信息
+    debug: PropTypes.bool,
+
+    // 设置自定义监听组件的模式，可选的有'default'、'exclude'、'include'，默认为'default'
+    listenPropsMode: PropTypes.oneOf(['default', 'exclude', 'include']),
+
+    // 设置需要忽略输出监听过程的组件信息列表
+    // 仅在listenPropsMode为'exclude'时生效
+    excludeProps: PropTypes.arrayOf(PropTypes.string),
+
+    // 设置需要包含输出监听过程的组件信息列表
+    // 仅在listenPropsMode为'include'时生效
+    includeProps: PropTypes.arrayOf(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.
+     */
+    setProps: PropTypes.func
+};
+
+// 设置默认参数
+FefferyTopProgress.defaultProps = {
+    spinning: false,
+    listenPropsMode: 'default',
+    excludeProps: [],
+    includeProps: [],
+    debug: false
+}
+
+export default FefferyTopProgress;

package/src/lib/index.js

@@ -3,11 +3,13 @@ import FefferyCaptcha from "./components/FefferyCaptcha.react";
 import FefferyWaterMark from "./components/FefferyWaterMark.react";
 import FefferySyntaxHighlighter from "./components/FefferySyntaxHighlighter.react";
 import FefferyPasteImage from "./components/FefferyPasteImage.react";
+import FefferyTopProgress from "./components/FefferyTopProgress.react"
 
 
 export {
     FefferyCaptcha,
     FefferyWaterMark,
     FefferySyntaxHighlighter,
-    FefferyPasteImage
+    FefferyPasteImage,
+    FefferyTopProgress
 };

package/usage.py

@@ -6,36 +6,37 @@ from dash import html
 app = dash.Dash(__name__)
 
 app.layout = html.Div(
-    [
-        fuc.FefferyPasteImage(
-            id='test',
-            style={
-                'height': '500px',
-                'width': '800px',
-                'marginBottom': '100px'
-            }
-        ),
-        html.Div(id='test-output'),
-
-
-        fuc.FefferyCaptcha(id='captcha-demo',
-                           charNum=10,
-                           width=300,
-                           height=100,
-                           fontSize=60),
-        html.Div(
-            html.Em(id='output-demo')
-        ),
-
-        fuc.FefferyWaterMark(
-            content='fuc FefferyWaterMark',
-            fontSize=26
-        ),
-
-        fuc.FefferySyntaxHighlighter(
-            showLineNumbers=True,
-            showInlineLineNumbers=True,
-            codeString='''html.Div(
+    fuc.FefferyTopProgress(
+        [
+            fuc.FefferyPasteImage(
+                id='test',
+                style={
+                    'height': '500px',
+                    'width': '800px',
+                    'marginBottom': '100px'
+                }
+            ),
+            html.Div(id='test-output'),
+
+
+            fuc.FefferyCaptcha(id='captcha-demo',
+                               charNum=10,
+                               width=300,
+                               height=100,
+                               fontSize=60),
+            html.Div(
+                html.Em(id='output-demo')
+            ),
+
+            fuc.FefferyWaterMark(
+                content='fuc FefferyWaterMark',
+                fontSize=26
+            ),
+
+            fuc.FefferySyntaxHighlighter(
+                showLineNumbers=True,
+                showInlineLineNumbers=True,
+                codeString='''html.Div(
     [
         fac.AntdBackTop(
             containerId='back-top-container-demo',
@@ -62,10 +63,15 @@ app.layout = html.Div(
     }
 )
 ''',
-            language='python',
-            codeStyle='coy-without-shadows'
-        )
-    ],
+                language='python',
+                codeStyle='coy-without-shadows'
+            )
+        ],
+        # listenPropsMode='exclude',
+        # excludeProps=['output-demo.children'],
+        debug=True,
+        showSpinner=False
+    ),
     style={
         'padding': '100px'
     }
@@ -74,14 +80,13 @@ app.layout = html.Div(
 
 @app.callback(
     Output('output-demo', 'children'),
-    Input('captcha-demo', 'captcha'),
-    prevent_initial_call=True
+    Input('captcha-demo', 'captcha')
 )
 def test(captcha):
 
     import time
 
-    time.sleep(3)
+    # time.sleep(3)
 
     return captcha
 

package/feffery_utils_components/FefferyFefferySyntaxHighlighter.py

@@ -1,46 +0,0 @@
-# AUTO GENERATED FILE - DO NOT EDIT
-
-from dash.development.base_component import Component, _explicitize_args
-
-
-class FefferyFefferySyntaxHighlighter(Component):
-    """A FefferyFefferySyntaxHighlighter component.
-
-
-Keyword arguments:
-
-- id (string; optional)
-
-- codeString (string; required)
-
-- language (string; default 'python')
-
-- loading_state (dict; optional)
-
-    `loading_state` is a dict with keys:
-
-    - component_name (string; optional):
-        Holds the name of the component that is loading.
-
-    - is_loading (boolean; optional):
-        Determines if the component is loading or not.
-
-    - prop_name (string; optional):
-        Holds which property is loading."""
-    @_explicitize_args
-    def __init__(self, id=Component.UNDEFINED, codeString=Component.REQUIRED, language=Component.UNDEFINED, loading_state=Component.UNDEFINED, **kwargs):
-        self._prop_names = ['id', 'codeString', 'language', 'loading_state']
-        self._type = 'FefferyFefferySyntaxHighlighter'
-        self._namespace = 'feffery_utils_components'
-        self._valid_wildcard_attributes =            []
-        self.available_properties = ['id', 'codeString', 'language', 'loading_state']
-        self.available_wildcard_properties =            []
-        _explicit_args = kwargs.pop('_explicit_args')
-        _locals = locals()
-        _locals.update(kwargs)  # For wildcard attrs
-        args = {k: _locals[k] for k in _explicit_args if k != 'children'}
-        for k in ['codeString']:
-            if k not in args:
-                raise TypeError(
-                    'Required argument `' + k + '` was not specified.')
-        super(FefferyFefferySyntaxHighlighter, self).__init__(**args)