update dist and lib

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.4.4-alpha (2019-09-05)
+
+### Bug Fixes
+
+- **scrollBoard:** Header column width is abnormal when row data is empty.
+
+# 2.4.3-alpha (2019-09-04)
+
+### Perfect
+
+- **scrollRankingBoard:** Add a unit configuration item.
+
 # 2.4.2-alpha (2019-08-30)
 
 ### Perfect

README.md

@@ -38,6 +38,19 @@ Vue.use(borderBox1)
 
 详细文档及示例请移步[HomePage](http://datav.jiaminghi.com).
 
+### TODO
+
+* **飞线图**添加多中心点及反向飞线功能
+* **边框**及**装饰**添加颜色及其他必要配置项，增强可配置性及灵活性.
+
+### 致谢
+
+组件库的开发基于个人学习和兴趣，由于技术水平及经验的限制，组件尚有许多不完善之处，如有BUG可及时提交[issue](https://github.com/jiaming743/DataV/issues/new?template=bug_report.md)或添加反馈群进行反馈，也欢迎提供指正和建议，感谢各位的支持。
+
+### 反馈
+
+![Feedback](./QQGroup.png)
+
 ### Demo
 
 Demo页面使用了全屏组件，请F11全屏后查看。

README_EN.md

@@ -39,6 +39,19 @@ Vue.use(borderBox1)
 
 Detailed documents and examples can be viewed on the [HomePage](http://datav.jiaminghi.com).
 
+### TODO
+
+* **flylineChart**Add multi-center point and reverse fly line function.
+* Add color and other necessary configuration to the **borderBox** and **decoration** to enhance configurability and flexibility.
+
+### Acknowledgement
+
+The development of the component library is based on personal learning and interest. Due to technical level and experience limitations, there are still many imperfections in the components. If there are errors, you can submit [issue](https://github.com/jiaming743/DataV/issues/new?template=bug_report.md) in time or add feedback groups for feedback. Welcome to provide corrections and suggestions. Thank you for your support.
+
+### Feedback
+
+![Feedback](./QQGroup.png)
+
 ### Demo
 
 The Demo page uses the full-screen component, please view it after F11 full screen.

build/entry.js

@@ -0,0 +1,4 @@
+import Vue from 'vue'
+import datav from '../src/index'
+
+Vue.use(datav)

build/index.js

@@ -1,14 +1,17 @@
 const { copyDir, fileForEach, readFile, writeFile, unlinkDirFileByExtname, dirForEach } = require('@jiaminghi/fs')
 const print = require('./plugin/print')
 const path = require('path')
-const doExec = require('./plugin/exec')
+const exec = require('./plugin/exec')
 
 const PACKAGE_SRC = './src'
 const COMPILE_SRC = './lib'
 const COMPONENTS_DIR = '/components'
 const ENTRANCE = '/index.js'
+const libName = 'datav'
 
 async function start () {
+  // Compile for NPM
+
   const copyPackage = await copyDir(PACKAGE_SRC, COMPILE_SRC)
 
   if (!copyPackage) {
@@ -63,6 +66,27 @@ async function start () {
 
   print.success('Finish adding components export statement!')
 
+  // Compile for UMD version
+  const rollupCompile = await exec(`rollup -c build/rollup.config.js`)
+
+  if (!rollupCompile) {
+    print.error('Exception in rollupCompile')
+
+    return
+  }
+
+  print.tip('After rollupCompile')
+
+  // const uglifyjs = await exec(`uglifyjs dist/${libName}.map.js -o dist/${libName}.min.js`)
+
+  // if (!uglifyjs) {
+  //   print.error('Exception in uglifyjs')
+
+  //   return
+  // }
+
+  // print.tip('After uglifyjs')
+
   print.yellow('-------------------------------------')
   print.success('     DataV Lib Compile Success!      ')
   print.yellow('-------------------------------------')
@@ -122,7 +146,7 @@ async function compileLessToCss () {
       maxBuffer: 1024 ** 5
     })
 
-    const compile = await doExec(execString)
+    const compile = await exec(execString)
 
     if (!compile) {
       print.error(execString + ' Error!')
@@ -180,6 +204,8 @@ async function addComponentsExport () {
   return write
 }
 
-module.exports = start
+async function compileUMDVersion () {
 
+}
 
+start()

build/rollup.config.js

@@ -0,0 +1,23 @@
+import resolve from 'rollup-plugin-node-resolve'
+import vue from 'rollup-plugin-vue'
+import commonjs from 'rollup-plugin-commonjs'
+import babel from 'rollup-plugin-babel'
+
+export default {
+  input: 'build/entry.js',
+  // input: 'src/index.js',
+  output: {
+    format: 'umd',
+    file: 'dist/datav.map.js',
+    name: 'datav'
+  },
+  plugins: [
+    resolve(),
+    babel({
+      exclude: 'node_modules/**'
+    }),
+    commonjs(),
+    vue(),
+  ],
+  external: ['Vue']
+}

lib/components/activeRingChart/src/main.vue

@@ -11,7 +11,7 @@
 <script>
 import Charts from '@jiaminghi/charts'
 
-import dvDigitalFlop from '../../digitalFlop/src/main'
+import dvDigitalFlop from '../../digitalFlop/src/main.vue'
 
 import { deepMerge } from '@jiaminghi/charts/lib/util/index'
 

lib/components/scrollBoard/src/main.vue

@@ -260,11 +260,16 @@ export default {
     calcWidths () {
       const { width, mergedConfig, rowsData } = this
 
-      const { columnWidth } = mergedConfig
+      const { columnWidth, header } = mergedConfig
 
       const usedWidth = columnWidth.reduce((all, w) => all + w, 0)
 
-      const columnNum = rowsData[0] ? rowsData[0].ceils.length : 0
+      let columnNum = 0
+      if (rowsData[0]) {
+        columnNum = rowsData[0].ceils.length
+      } else if (header.length) {
+        columnNum = header.length
+      }
 
       const avgWidth = (width - usedWidth) / (columnNum - columnWidth.length)
 

lib/components/scrollRankingBoard/src/main.vue

@@ -9,7 +9,7 @@
       <div class="ranking-info">
         <div class="rank">No.{{ item.ranking }}</div>
         <div class="info-name">{{ item.name }}</div>
-        <div class="ranking-value">{{ item.value }}</div>
+        <div class="ranking-value">{{ item.value + mergedConfig.unit }}</div>
       </div>
 
       <div class="ranking-column">
@@ -69,7 +69,14 @@ export default {
          * @default carousel = 'single'
          * @example carousel = 'single' | 'page'
          */
-        carousel: 'single'
+        carousel: 'single',
+        /**
+         * @description Value unit
+         * @type {String}
+         * @default unit = ''
+         * @example unit = 'ton'
+         */
+        unit: ''
       },
 
       mergedConfig: null,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiaminghi/data-view",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "author": "JiaMing <743192023@qq.com>",
   "description": "Vue Large screen data display component library",
   "main": "lib/index.js",
@@ -9,8 +9,8 @@
     "url": "https://github.com/jiaming743/DataV.git"
   },
   "scripts": {
-    "compile": "node publish.js",
+    "build": "node build/index.js",
-    "prepublish": "npm run compile",
+    "prepublish": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "license": "MIT",
@@ -24,10 +24,21 @@
     "datavisual"
   ],
   "dependencies": {
-    "@jiaminghi/charts": "*"
+    "@jiaminghi/charts": "*",
+    "@babel/runtime": "^7.5.5"
   },
   "homepage": "https://github.com/jiaming743/DataV#readme",
   "devDependencies": {
-    "@jiaminghi/fs": "0.0.1"
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@jiaminghi/fs": "0.0.1",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-uglify": "^6.0.3",
+    "rollup-plugin-vue": "^5.0.1",
+    "vue-template-compiler": "^2.6.10"
   }
 }

publish.js

@@ -1,3 +0,0 @@
-const start = require('./publish/index')
-
-start()

src/components/activeRingChart/src/main.vue

@@ -11,7 +11,7 @@
 <script>
 import Charts from '@jiaminghi/charts'
 
-import dvDigitalFlop from '../../digitalFlop/src/main'
+import dvDigitalFlop from '../../digitalFlop/src/main.vue'
 
 import { deepMerge } from '@jiaminghi/charts/lib/util/index'
 

src/components/scrollBoard/src/main.vue

@@ -260,11 +260,16 @@ export default {
     calcWidths () {
       const { width, mergedConfig, rowsData } = this
 
-      const { columnWidth } = mergedConfig
+      const { columnWidth, header } = mergedConfig
 
       const usedWidth = columnWidth.reduce((all, w) => all + w, 0)
 
-      const columnNum = rowsData[0] ? rowsData[0].ceils.length : 0
+      let columnNum = 0
+      if (rowsData[0]) {
+        columnNum = rowsData[0].ceils.length
+      } else if (header.length) {
+        columnNum = header.length
+      }
 
       const avgWidth = (width - usedWidth) / (columnNum - columnWidth.length)
 

src/components/scrollRankingBoard/src/main.vue

@@ -9,7 +9,7 @@
       <div class="ranking-info">
         <div class="rank">No.{{ item.ranking }}</div>
         <div class="info-name">{{ item.name }}</div>
-        <div class="ranking-value">{{ item.value }}</div>
+        <div class="ranking-value">{{ item.value + mergedConfig.unit }}</div>
       </div>
 
       <div class="ranking-column">
@@ -69,7 +69,14 @@ export default {
          * @default carousel = 'single'
          * @example carousel = 'single' | 'page'
          */
-        carousel: 'single'
+        carousel: 'single',
+        /**
+         * @description Value unit
+         * @type {String}
+         * @default unit = ''
+         * @example unit = 'ton'
+         */
+        unit: ''
       },
 
       mergedConfig: null,