Merge branch 'v1.0.x'

yoobool · Feb 17, 2021 · 47955d9 · 47955d9
2 parents 332c19e + 1623f6e
commit 47955d9
Show file tree

Hide file tree

Showing 34 changed files with 710 additions and 159 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/src/flask_state/static/flask_state.png)
+![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/src/flask_state/static/flask_state.png)
 
 [![Contributor Badge](https://img.shields.io/badge/Contributions-Welcome-0059b3)](https://github.com/yoobool/flask-state/tree/master/.github/ISSUE_TEMPLATE)
 [![Gitter Badge](https://img.shields.io/badge/Chat-Gitter-ff69b4.svg?label=Chat&logo=gitter)](https://gitter.im/flaskstate/community)
@@ -11,7 +11,7 @@ English | [简体中文](https://github.com/yoobool/flask-state/blob/master/READ
 
 Flask-State is a lightweight chart plugin for displaying machine state data in your web application.
 
-* **Monitored Metric:** CPU, memory, disk usage, LoadAVG and boot time.
+* **Monitored Metric:** CPU, memory, disk usage, disk IO, Network IO, LoadAVG and boot time.
 * **Extensible:** Offers rich customization options, including redis monitoring, user authentication,
 custom logging, i18n and etc.
 * **Stable:** Solves multiprocessing concurrency problems (if you use [gunicorn](https://gunicorn.org/))
@@ -20,7 +20,7 @@ built on top of lightweight dependencies.
 This project is in active development and thoroughly tested to ensure that Flask-State
 stays up-to-date with its project roadmap.
 
-![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/examples/static/flask_state.png)
+![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/examples/static/flask_state.png)
 
 ## Documentation
 
@@ -39,8 +39,8 @@ Alternatively, install Flask-State via NPM or include this script tag to the hea
 section of your HTML document:
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.6/packages/umd/flask-state.min.js"></script>
-<link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.6/packages/flask-state.min.css" rel="stylesheet">
+<script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/umd/flask-state.min.js"></script>
+<link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/flask-state.min.css" rel="stylesheet">
 ```
 
 ```bash

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -1,6 +1,6 @@
 [English](https://github.com/yoobool/flask-state/blob/master/README.md) | 简体中文
 
-![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/src/flask_state/static/flask_state.png)
+![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/src/flask_state/static/flask_state.png)
 
 [![Contributor Badge](https://img.shields.io/badge/Contributions-Welcome-0059b3)](https://github.com/yoobool/flask-state/tree/master/.github/ISSUE_TEMPLATE)
 [![Gitter Badge](https://img.shields.io/badge/Chat-Gitter-ff69b4.svg?label=Chat&logo=gitter)](https://gitter.im/flaskstate/community)
@@ -12,15 +12,15 @@
 
 Flask-State是一款在您浏览器上使用的轻便、图表化插件。
 
-* **监控状态**：CPU，内存，磁盘，LoadAvg，启动时长。
+* **监控状态**：CPU，内存，磁盘，磁盘IO, 网络IO, LoadAvg，启动时长。
 * **可扩展**：除记录本机状态外，还包括丰富的扩展功能选择。其中有Redis监控、用户验证、自定义logging和i18n等。
 * **稳定**：轻量级的依赖关系，同时解决了多进程并发问题。
 
 Flask-State是一个活跃的项目，经过了充分的测试以及有一系列的更新计划。
 
 ###
 
-![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/examples/static/flask_state.png)
+![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/examples/static/flask_state.png)
 
 ## Documentation
 
@@ -31,6 +31,21 @@ Flask-State是一个活跃的项目，经过了充分的测试以及有一系列
 
 从这里 [PyPI](https://pip.pypa.io/en/stable/quickstart/) 下载:
 
+```bash
+pip install Flask-State
+```
+
+通过NPM安装Flask-State或将此脚本标签放在HTML文件的开头部分:
+
+```html
+<script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/umd/flask-state.min.js"></script>
+<link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/flask-state.min.css" rel="stylesheet">
+```
+
+```bash
+npm install flask-state --save
+```
+
 ## Usage
 
 Flask-State插件安装后，还需要引入JavaScript文件和CSS文件，然后初始化组件运行方式。在某些配置上，你也可以选择修改。

diff --git a/examples/static/flask_state.png b/examples/static/flask_state.png
diff --git a/examples/static/initial.js b/examples/static/initial.js
diff --git a/examples/templates/index.html b/examples/templates/index.html
@@ -5,16 +5,17 @@
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>index</title>
-    <script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.6/packages/umd/flask-state.min.js"></script>
-    <link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.6/packages/flask-state.min.css" rel="stylesheet">
+<link href="../static/dist/css/flask-state.css" rel="stylesheet"></head>
+    <script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/umd/flask-state.min.js"></script>
+    <link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/flask-state.min.css" rel="stylesheet">
 </head>
 <body style="height: 100%;background-color: purple">
 <script src="https://cdn.staticfile.org/echarts/4.2.1/echarts.min.js"></script>
-<div id="test_id"
-     style="margin: 0 auto;background-color: #fff;border-radius: 100px;width: 100px;height: 100px;cursor: pointer;opacity: 0.5;border: 1px solid #777;text-align: center;line-height: 100px">
+<div id="test_id" style="margin: 0 auto;background-color: #fff;border-radius: 100px;width: 100px;height: 100px;cursor: pointer;opacity: 0.5;border: 1px solid #777;text-align: center;line-height: 100px">
     click me
 </div>
+</body>
 <script type="text/javascript">
     flaskState.init({dom: document.getElementById("test_id")});
 </script>
-</html>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flask-state",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Flask-States is a visual plug-in based on flask. It can record the local state every minute and read the status of redis if you have configured redis，and generate data chart to show to users through Echarts.",
   "main": "./packages/index.js",
   "directories": {

diff --git a/packages/README.md b/packages/README.md
@@ -1,4 +1,4 @@
-![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/src/flask_state/static/flask_state.png)
+![Project Logo](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/src/flask_state/static/flask_state.png)
 
 [![Contributor Badge](https://img.shields.io/badge/Contributions-Welcome-0059b3)](https://github.com/yoobool/flask-state/tree/master/.github/ISSUE_TEMPLATE)
 [![Gitter Badge](https://img.shields.io/badge/Chat-Gitter-ff69b4.svg?label=Chat&logo=gitter)](https://gitter.im/flaskstate/community)
@@ -10,7 +10,7 @@
 
 Flask-State is a lightweight chart plugin for displaying machine state data in your web application.
 
-* **Monitored Metric:** CPU, memory, disk usage, LoadAVG and boot time.
+* **Monitored Metric:** CPU, memory, disk usage, disk IO, Network IO, LoadAVG and boot time.
 * **Extensible:** Offers rich customization options, including redis monitoring, user authentication,
 custom logging, i18n and etc.
 * **Stable:** Solves multiprocessing concurrency problems (if you use [gunicorn](https://gunicorn.org/))
@@ -19,7 +19,7 @@ built on top of lightweight dependencies.
 This project is in active development and thoroughly tested to ensure that Flask-State
 stays up-to-date with its project roadmap.
 
-![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.6/examples/static/flask_state.png)
+![Screenshot](https://cdn.jsdelivr.net/gh/yoobool/flask-state@1.0.7/examples/static/flask_state.png)
 
 ## Documentation
 
@@ -38,7 +38,8 @@ Alternatively, install Flask-State via NPM or include this script tag to the hea
 section of your HTML document:
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.6/packages/umd/flask-state.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/umd/flask-state.min.js"></script>
+<link href="https://cdn.jsdelivr.net/gh/yoobool/flask-state@v1.0.7/packages/flask-state.min.css" rel="stylesheet">
 ```
 
 ```bash