Merge branch 'develop_fixbug'

Author: yinLiangDream

Diff for: .gitignore

@@ -4,4 +4,4 @@ rn_temp/
 node_modules/
 .DS_Store
 coverage/
-.idea/workspace.xml
+.idea/

Diff for: .idea/taro-ui-sample.iml

@@ -7,6 +7,7 @@ import {
   lightBgColorType,
   normalSizeType
 } from "./baseType";
+import {IconProps} from './icon'
 
 export interface IProps extends BaseComponent {
   /**
@@ -61,7 +62,7 @@ export interface IProps extends BaseComponent {
    *
    * 默认 `add`
    */
-  icon?: iconType;
+  icon?: iconType | IconProps;
   /**
    * 背景色
    *

Diff for: .idea/workspace.xml

@@ -23,7 +23,7 @@ import { ClFloatButton } from "mp-colorui";
 | shadow          | 是否有阴影     | boolean      | -                                                            | `true`     |
 | move            | 是否可移动     | boolean      | -                                                            | `false`    |
 | open            | 是否可展开     | boolean      | -                                                            | `true`     |
-| icon            | 图标           | string       | 参考文档 [Icon-iconName](/mp-colorui-doc/base/icon#iconname) | `add`      |
+| icon            | 图标，可以传参为图标名或者直接 icon 类型           | string 、 Icon      | 参考文档 [Icon-iconName](/mp-colorui-doc/base/icon#iconname) | `add`      |
 | bgColor         | 背景色         | string       | 参考文档 [默认色](/mp-colorui-doc/home/color)                | `blue`     |
 | iconColor       | 图标色         | string       | 参考文档 [默认色-标准色](/mp-colorui-doc/home/color#标准色)  | -          |
 | direction       | 展开方向       | string       | `vertical`,`horizontal`                                      | `vertical` |

Diff for: @types/floatButton.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "mp-colorui",
-  "version": "0.6.16",
+  "version": "0.6.17",
   "description": "MP ColorUI 是一款基于 Taro 框架并且联合 Color-UI CSS 库开发的多端 UI 组件库（支持小程序端和H5端）",
   "keywords": [
     "taro",

Diff for: docs/base/floatButton.md

@@ -174,7 +174,11 @@ export default function ClFloatButton(props: IProps) {
                 transition: "all 0.15s linear"
               }}
             >
-              <ClIcon iconName={icon} size={size} />
+              {typeof icon === "string" ? (
+                <ClIcon iconName={icon as string} size={size} />
+              ) : (
+                <ClIcon {...icon} />
+              )}
             </View>
           </View>
         </View>

Diff for: package-lock.json

@@ -2,14 +2,11 @@ const fs = require("fs");
 const path = require("path");
 
 // 文档所在绝对地址
-const docPath =
-  "/Users/ly/develop/WebProject/WeChatMiniProgram/mp-colorui-doc/";
+const docPath = "../../../mp-colorui-doc/";
 // 打包完成所在地址
-const distPath =
-  "/Users/ly/develop/WebProject/WeChatMiniProgram/mp-colorui/docs/.vuepress/dist/";
+const distPath = "../../docs/.vuepress/dist";
 // code 所在
-const publicPath =
-  "/Users/ly/develop/WebProject/WeChatMiniProgram/mp-colorui/docs/.vuepress/public";
+const publicPath = "../../docs/.vuepress/public";
 
 // 删除/移动文件
 const transfromFile = (relativePath, type) => {
@@ -21,7 +18,12 @@ const transfromFile = (relativePath, type) => {
       if (fs.statSync(currentPath).isDirectory()) {
         if (type === "copy")
           fs.mkdirSync(
-            path.join(docPath, relativePath.split(distPath)[1] || "", filename)
+            path.join(
+              __dirname,
+              docPath,
+              relativePath.split(distPath)[1] || "",
+              filename
+            )
           );
         if (filename !== ".git") transfromFile(currentPath, type);
       } else {
@@ -57,7 +59,7 @@ const cos = new COS({
   SecretKey: "tdsPqiS6MdpriUAjDbpsodKtSvFQWVM7"
 });
 
-const allcodeName = fs.readdirSync(publicPath);
+const allcodeName = fs.readdirSync(path.join(__dirname, publicPath));
 
 // 循环上传
 allcodeName.forEach(name => {
@@ -66,7 +68,7 @@ allcodeName.forEach(name => {
       Bucket: "mp-colorui-1255362963" /* 必须 */,
       Region: "ap-chengdu" /* 必须 */,
       Key: `code/${name}`,
-      Body: fs.createReadStream(path.join(docPath, name)),
+      Body: fs.createReadStream(path.join(__dirname, docPath, name))
       // onProgress: function(progressData) {
       //   console.log(JSON.stringify(progressData));
       // }