DataV-Team · zhangguoqiang1107 · Sep 7, 2019 · Sep 10, 2019 · Sep 11, 2019 · Sep 11, 2019
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-present, JiaMing
+Copyright (c) 2018-present, DataV-Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center"><a href="http://datav.jiaminghi.com">datav.jiaminghi.com</a></h1>
 
 <p align="center">
-    <a href="https://github.com/jiaming743/datav.jiaminghi.com/blob/master/LICENSE"><img src="https://img.shields.io/github/license/jiaming743/datav.jiaminghi.com.svg" alt="LICENSE" /> </a>
+    <a href="https://github.com/DataV-Team/datav.jiaminghi.com/blob/master/LICENSE"><img src="https://img.shields.io/github/license/DataV-Team/datav.jiaminghi.com.svg" alt="LICENSE" />
 </p>
 
 ### Project setup
@@ -22,4 +22,4 @@ yarn dev
 yarn build
 ```
 
-[Datav](https://github.com/jiaming743/datav)
+[Datav](https://github.com/DataV-Team/Datav)
diff --git a/demo/construction-data/package.json b/demo/construction-data/package.json
@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@jiaminghi/data-view": "^2.3.3",
+    "@jiaminghi/data-view": "^2.4.4",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
     "vue": "^2.6.10"

diff --git a/demo/construction-data/public/index.html b/demo/construction-data/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>施工养护综合数据</title>
+    <title>DATAV-DEMO</title>
   </head>
   <body>
     <noscript>

diff --git a/demo/construction-data/yarn.lock b/demo/construction-data/yarn.lock
@@ -642,6 +642,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.5.5":
+  version "7.6.0"
+  resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205"
+  integrity sha1-T8HWQqn9Apl1Totd5ixjHPVWggU=
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.1.0", "@babel/template@^7.4.4":
   version "7.4.4"
   resolved "https://registry.npm.taobao.org/@babel/template/download/@babel/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
@@ -753,11 +760,12 @@
   dependencies:
     "@babel/polyfill" "^7.4.4"
 
-"@jiaminghi/data-view@^2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@jiaminghi/data-view/-/data-view-2.3.3.tgz#712ac5c21a7b69384baa577633f6e2e4b5565a5a"
-  integrity sha512-GMaCRNrpVYTbQEZZgIi7cZpJVumDSy7bwC9pPofnunzY9N0UolivM4pCi2tDHJRp3VT0LUvaBi0oTTEohHbB+Q==
+"@jiaminghi/data-view@^2.4.4":
+  version "2.4.4"
+  resolved "https://registry.npm.taobao.org/@jiaminghi/data-view/download/@jiaminghi/data-view-2.4.4.tgz#b7c7fb45584d4639b6f08ba7397da23c8520a70a"
+  integrity sha1-t8f7RVhNRjm28IunOX2iPIUgpwo=
   dependencies:
+    "@babel/runtime" "^7.5.5"
     "@jiaminghi/charts" "*"
 
 "@jiaminghi/transition@*":

diff --git a/demo/electronic-file/src/components/datav/CenterCmp.vue b/demo/electronic-file/src/components/datav/CenterCmp.vue
@@ -1,5 +1,5 @@
 <template>
-  <dir class="center-cmp">
+  <div class="center-cmp">
     <div class="cc-header">
       <dv-decoration-1 style="width:200px;height:50px;" />
       <div>机电设备总数</div>
@@ -37,7 +37,7 @@
 
       <LabelTag :config="labelConfig" />
     </div>
-  </dir>
+  </div>
 </template>
 
 <script>

diff --git a/deploy/index.js b/deploy/index.js
@@ -1,4 +1,4 @@
-const { fileForEach } = require('@jiaminghi/fs')
+const { fileForEach, readFile, writeFile } = require('@jiaminghi/fs')
 const Client = require('ftp')
 const print = require('./plugin/print')
 const { emptyDir, put, mkDir } = require('./plugin/ftp')
@@ -66,6 +66,34 @@ ftp.on('error', foo => {
   print.tip('FTP error')
 })
 
+const GrowingIO_SDK = `
+    <!-- GrowingIO Analytics code version 2.1 -->
+    <!-- Copyright 2015-2018 GrowingIO, Inc. More info available at http://www.growingio.com -->
+    <script type='text/javascript'>
+      !function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
+        gio('init','8c2b1ac53bbd18d5', {});
+      gio('send');
+    </script>
+    <!-- End GrowingIO Analytics code version: 2.1 -->
+`
+
+async function addGrowingIOSDK () {
+  const indexPagePath = DIST_PATH + '/index.html'
+
+  let indexPage = await readFile(indexPagePath)
+
+  if (!indexPage) return false
+
+  if (indexPage.indexOf(GrowingIO_SDK) !== -1) return true
+
+  const addedSDKHead = indexPage.match(/<head>(\s|\S)*<\/head>/)[0]
+    .replace('</head>', `${GrowingIO_SDK}\n   </head>`)
+
+  indexPage = indexPage.replace(/<head>(\s|\S)*<\/head>/, addedSDKHead)
+
+  return writeFile(indexPagePath, indexPage)
+}
+
 const { host, user, pass } = config || getNodeParams()
 
 if (!host || !user || !pass) {
@@ -74,10 +102,24 @@ if (!host || !user || !pass) {
   return false
 }
 
-print.tip('Start Upload!')
+try {
+  (async function () {
+    print.tip('Start add Growing IO SDK!')
+
+    const addGIOSDK = await addGrowingIOSDK()
 
-ftp.connect({
-  host,
-  user,
-  password: pass
-})
+    if (!addGIOSDK) return print.error('Add Growing IO SDK fail!')
+
+    print.tip('Add Growing IO SDK success!')
+
+    print.tip('Start Upload!')
+
+    ftp.connect({
+      host,
+      user,
+      password: pass
+    })
+  })()
+} catch {
+  print.error('Deploy Fail!')
+}
diff --git a/docs/.vuepress/components/dev.vue b/docs/.vuepress/components/dev.vue
@@ -1,31 +1,26 @@
 <template>
   <div id="dev-container">
-    <dv-scroll-board :config="config" class="dev" style="width: 500px;height:200px" />
   </div>
 </template>
 
 <script>
+
 export default {
   name: 'dev',
   data () {
-    return {
-      config: {
-        header: ['列1', '列2', '列3'],
-        data: [
-        ]
-      }
-    }
+    return {}
   },
-  created () {
-
+  methods: {
+  },
+  async mounted () {
   }
 }
 </script>
 
 <style lang="less">
 #dev-container {
   width: 100%;
-  height: 300px;
+  height: 600px;
   box-shadow: 0 0 3px green;
   display: flex;
   justify-content: center;

diff --git a/docs/.vuepress/components/reactPageBtn.vue b/docs/.vuepress/components/reactPageBtn.vue
@@ -0,0 +1,27 @@
+<template>
+  <span class="react-page-btn">
+    （<span class="green" @click="turnToReactPage">React版<OutboundLink /></span>）
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'ReactPageBtn',
+  methods: {
+    turnToReactPage () {
+      const { pathname } = location
+
+      window.open(`http://datav-react.jiaminghi.com${pathname}`)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.react-page-btn .green {
+  color: #3eaf7c;
+  cursor: pointer;
+  font-weight: 500;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+}
+</style>
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -1,104 +1,73 @@
 module.exports = {
-  title: 'Datav',
-  description: 'Just playing around',
+  title: "DataV",
+  description: "Vue 大屏数据展示组件库",
   head: [
-    ['link', { rel: 'icon', href: '/favicon.ico' }]
+    ["meta", { name: "keywords", content: "datav,data,bi,开源,免费,大屏" }],
+    ["link", { rel: "icon", href: "/favicon.ico" }],
   ],
-  host: 'localhost',
+  host: "localhost",
   port: 5000,
-  locales: {
-    '/': {
-      lang: 'zh-CN',
-      title: 'DataV',
-      description: 'Vue 大屏数据展示组件库'
-    },
-    '/EN/': {
-      lang: 'en-US',
-      title: 'DataV',
-      description: 'Vue large screen data display component library'
-    }
-  },
   themeConfig: {
-    locales: {
-      '/': {
-        selectText: '选择语言',
-        label: '简体中文',
-        nav: [
-          {
-            text: '指南',
-            link: '/guide/'
-          },
+    nav: [
+      {
+        text: "指南",
+        link: "/guide/",
+      },
+      {
+        text: "Vue3 & React版本",
+        items: [
           {
-            text: '支持',
-            link: '/support/'
+            text: "Vue3版本",
+            link: "https://datav-vue3.jiaminghi.com/",
           },
           {
-            text: 'Demo',
-            link: '/demo/'
+            text: "React版本",
+            link: "http://datav-react.jiaminghi.com/",
           },
-          {
-            text: 'GitHub',
-            items: [
-              {
-                text: '项目源码仓库',
-                link: 'https://github.com/jiaming743/datav'
-              },
-              {
-                text: '文档及Demo源码仓库',
-                link: 'https://github.com/jiaming743/datav.jiaminghi.com'
-              }
-            ]
-          }
         ],
-        sidebar: {
-          '/guide/': [
-            '',
-            'fullScreenContainer',
-            'loading',
-            'borderBox',
-            'decoration',
-            'charts',
-            'activeRingChart',
-            'capsuleChart',
-            'waterLevelPond',
-            'percentPond',
-            'flylineChart',
-            'conicalColumnChart',
-            'digitalFlop',
-            'scrollBoard',
-            'scrollRankingBoard'
-          ],
-          '/dev/': ['']
-        }
       },
-      '/EN/': {
-        selectText: 'Languages',
-        label: 'English',
-        nav: [
+      {
+        text: "支持",
+        link: "/support/",
+      },
+      {
+        text: "Demo",
+        link: "/demo/",
+      },
+      {
+        text: "GitHub",
+        items: [
           {
-            text: 'Guide',
-            link: '/guide/'
+            text: "项目源码仓库",
+            link: "https://github.com/DataV-Team/Datav",
           },
           {
-            text: 'GitHub',
-            items: [
-              {
-                text: '项目源码仓库',
-                link: 'https://github.com/jiaming743/datav'
-              },
-              {
-                text: '文档及Demo源码仓库',
-                link: 'https://github.com/jiaming743/datav.jiaminghi.com'
-              }
-            ]
-          }
+            text: "文档及Demo源码仓库",
+            link: "https://github.com/DataV-Team/datav.jiaminghi.com",
+          },
         ],
-        sidebar: {
-          '/EN/guide/': [
-            ''
-          ]
-        }
-      }
-    }
-  }
-}
+      },
+    ],
+    sidebar: {
+      "/guide/": [
+        "",
+        "fullScreenContainer",
+        "loading",
+        "borderBox",
+        "decoration",
+        "charts",
+        "activeRingChart",
+        "capsuleChart",
+        "waterLevelPond",
+        "percentPond",
+        "flylineChart",
+        "flylineChartEnhanced",
+        "conicalColumnChart",
+        "digitalFlop",
+        "scrollBoard",
+        "scrollRankingBoard",
+      ],
+      "/dev/": [""],
+    },
+  },
+};
diff --git a/docs/.vuepress/public/baidu_verify_cQ2lJRe4pj.html b/docs/.vuepress/public/baidu_verify_cQ2lJRe4pj.html
@@ -0,0 +1 @@
+cQ2lJRe4pj
diff --git a/docs/.vuepress/public/favicon.ico b/docs/.vuepress/public/favicon.ico