filtered-data event test case && serverData bug fix

Author: FreezingRiver

test/unit/specs/actionBar.spec.js

@@ -57,7 +57,7 @@ describe('client actionBar render', _ => {
       methods: {
         handleClick(command) {
           spy1()
-          console.log(command)
+          this.$message(`click dropdown button ${command}`)
         }
       }
     }, true)

test/unit/specs/actionCol.spec.js

@@ -24,6 +24,8 @@ let actionColRender = async function(vm, spy1, spy2) {
   await nextTick(vm)
   newRows = getTableItems(vm).rows
   newRows.should.have.length(rows.length - 1)
+  destroyVM(vm)
+  await nextTick(vm)
 }
 
 describe('client actionColDef', _ => {
@@ -87,7 +89,6 @@ describe('client actionColDef', _ => {
     actionColRender(vm, spy1, spy2)
   })
 })
-
 describe('server actionColDef', _ => {
   let vm
   afterEach(function() {

test/unit/specs/checkFilters.spec.js

@@ -482,7 +482,7 @@ describe('server checkFilter', _ => {
         }
       }
     }, true)
-    await sleep(1000)
+    await sleep(1500)
     let tool = vm.$el.find('.tool')
     let inputElm = tool.findAll('input')
 

test/unit/specs/event.spec.js

@@ -0,0 +1,51 @@
+import { data, titles } from '../tools/source'
+import { createVue, nextTick, simulateEvent } from '../tools/utils'
+
+describe('client event', _ => {
+  let vm
+  afterEach(function() {
+    // vm && destroyVM(vm)
+  })
+  it.only('filtered-data event', async () => {
+    vm = createVue({
+      template: `
+        <data-tables :data="data" :filters="filters" @filtered-data="handleFilteredData">
+          <el-row slot='tool' style='margin: 10px 0'>
+            <el-col :span='6'>
+              <el-input style="width: 200px; margin-left: 20px;" v-model="filters[0].value"></el-input>
+            </el-col>
+          </el-row>
+          <el-table-column v-for="title in titles" :prop="title.prop" :label="title.label" :key="title.label">
+          </el-table-column>
+        </data-tables>
+      `,
+      data() {
+        return {
+          data: data(),
+          titles,
+          filters: [{
+            value: ''
+          }],
+          filteredData: [],
+          columns: ['flow_no', 'content', 'flow_type'],
+          columnNames: ['Flow NO.', 'Content', 'type']
+        }
+      },
+      methods: {
+        handleFilteredData(filteredData) {
+          this.filteredData = filteredData
+        }
+      }
+    }, true)
+    await nextTick(vm)
+    let tool = vm.$el.find('.tool')
+    let inputElm = tool.findAll('input')
+
+    simulateEvent(inputElm.at(0), 'FW201601010001', 'input')
+    await nextTick(vm)
+    vm.$data.filteredData.should.have.length(1)
+    vm.$data.filteredData[0].content.should.equal('Water flood')
+    vm.$data.filteredData[0].flow_no.should.equal('FW201601010001')
+    vm.$data.filteredData[0].flow_type.should.equal('Repair')
+  })
+})

test/unit/specs/pagination.spec.js

@@ -11,7 +11,7 @@ let getPaginationItems = function(vm) {
   }
 }
 
-describe.skip('client pagination render', _ => {
+describe('client pagination render', _ => {
   let vm
   afterEach(function() {
     vm && destroyVM(vm)
@@ -63,7 +63,7 @@ describe.skip('client pagination render', _ => {
     currentRows.should.have.length(3)
   })
 })
-describe.skip('server pagination render', _ => {
+describe('server pagination render', _ => {
   let vm
   afterEach(function() {
     vm && destroyVM(vm)

test/unit/tools/source.js

@@ -36,15 +36,17 @@ let titles = [{
   label: 'Type'
 }]
 
-let serverData = []
-
-for (let i = 0; i < 1000; i++) {
-  serverData.push({
-    content: 'Lock broken' + i,
-    flow_no: 'FW20160101000' + i,
-    flow_type: i % 2 === 0 ? 'Repair' : 'Help',
-    flow_type_code: i % 2 === 0 ? 'repair' : 'help'
-  })
+let serverData = () => {
+  let serverData = []
+  for (let i = 0; i < 1000; i++) {
+    serverData.push({
+      content: 'Lock broken' + i,
+      flow_no: 'FW20160101000' + i,
+      flow_type: i % 2 === 0 ? 'Repair' : 'Help',
+      flow_type_code: i % 2 === 0 ? 'repair' : 'help'
+    })
+  }
+  return serverData
 }
 
 /*
@@ -55,7 +57,8 @@ filters: this.filters
 */
 
 export let mockServer = function(res) {
-  let datas = serverData.slice()
+  let datas = serverData().slice()
+  // let [...datas] = serverData()
   let allKeys = Object.keys(data()[0])
 
   // do filter