fix: table :rowSelection, Tree.jsx

src/components/CountDown/CountDown.vue

@@ -23,8 +23,7 @@
       },
       onEnd: {
         type: Function,
-        default: () => {
-        }
+        default: () => ({})
       }
     },
     data() {

src/components/Tree/Tree.jsx

@@ -10,14 +10,21 @@ export default {
       type: Array,
       required: true
     },
+    openKeys: {
+      type: Array,
+      default: () => []
+    },
     search: {
       type: Boolean,
       default: false
     }
   },
+  created () {
+    this.localOpenKeys = this.openKeys.slice(0)
+  },
   data () {
     return {
-      openKeys: []
+      localOpenKeys: []
     }
   },
   methods: {
@@ -100,6 +107,7 @@ export default {
   render () {
     const { dataSource, search } = this.$props
 
+    // this.localOpenKeys = openKeys.slice(0)
     const list = dataSource.map(item => {
       return this.renderItem(item)
     })
@@ -107,7 +115,7 @@ export default {
     return (
       <div class="tree-wrapper">
         { search ? this.renderSearch() : null }
-        <Menu mode="inline" class="custom-tree" {...{ on: { click: item =>  this.$emit('click', item) } }}>
+        <Menu mode="inline" class="custom-tree" {...{ on: { click: item =>  this.$emit('click', item), 'update:openKeys': val => { this.localOpenKeys = val } }}} openKeys={this.localOpenKeys}>
           { list }
         </Menu>
       </div>

src/components/page/PageLayout.vue

@@ -76,7 +76,7 @@
       },
       tabs: {
         type: Object,
-        default: () => {}
+        default: () => ({})
       }
     },
     methods: {

src/components/table/index.js

@@ -49,6 +49,10 @@ export default {
       type: [Object, Boolean],
       default: null
     },
+    rowSelection: {
+      type: Object,
+      default: () => ({})
+    },
     /** @Deprecated */
     showAlertInfo: {
       type: Boolean,
@@ -172,12 +176,13 @@ export default {
      */
     updateSelect (selectedRowKeys, selectedRows) {
       this.selectedRows = selectedRows
+      this.selectedRowKeys = selectedRowKeys
       const list = this.needTotalList
       this.needTotalList = list.map(item => {
         return {
           ...item,
           total: selectedRows.reduce((sum, val) => {
-            const total = sum + get(val, item.dataIndex)
+            const total = sum + parseInt(get(val, item.dataIndex))
             return isNaN(total) ? 0 : total
           }, 0)
         }
@@ -198,6 +203,7 @@ export default {
      * @returns {*}
      */
     renderClear (callback) {
+      if (this.selectedRowKeys.length <= 0) return null
       return (
         <a style="margin-left: 24px" onClick={() => {
           callback()
@@ -236,7 +242,7 @@ export default {
   render () {
     const props = {}
     const localKeys = Object.keys(this.$data)
-    const showAlert = (typeof this.alert === 'object' && this.alert !== null && this.alert.show) || this.alert
+    const showAlert = (typeof this.alert === 'object' && this.alert !== null && this.alert.show) && typeof this.rowSelection.selectedRowKeys !== 'undefined' || this.alert
 
     Object.keys(T.props).forEach(k => {
       const localKey = `local${k.substring(0, 1).toUpperCase()}${k.substring(1)}`
@@ -246,10 +252,11 @@ export default {
       if (showAlert && k === 'rowSelection') {
         // 重新绑定 rowSelection 事件
         return props[k] = {
-          selectedRowKeys: this[k].selectedRowKeys,
+          selectedRows: this.selectedRows,
+          selectedRowKeys: this.selectedRowKeys,
           onChange: (selectedRowKeys, selectedRows) => {
             this.updateSelect(selectedRowKeys, selectedRows)
-            this[k].onChange(selectedRowKeys, selectedRows)
+            typeof this[k].onChange !== 'undefined' && this[k].onChange(selectedRowKeys, selectedRows)
           }
         }
       }

src/utils/filter.js

 import Vue from 'vue'
 import moment from 'moment'
+import 'moment/locale/zh-cn'
+moment.locale('zh-cn')
 
 Vue.filter('NumberFormat', function (value) {
   if (!value) {

src/views/list/TableInnerEditList.vue

@@ -80,8 +80,7 @@
       size="default"
       :columns="columns"
       :data="loadData"
-      :showAlertInfo="true"
-      @onSelect="onChange"
+      :alert="{ show: true, clear: true }"
     >
       <template v-for="(col, index) in columns" v-if="col.scopedSlots" :slot="col.dataIndex" slot-scope="text, record, index">
         <div :key="index">
@@ -89,7 +88,7 @@
             v-if="record.editable"
             style="margin: -5px 0"
             :value="text"
-            @change="e => handleChange(e.target.value, record.key, col)"
+            @change="e => handleChange(e.target.value, record.key, col, record)"
           />
           <template v-else>{{ text }}</template>
         </div>
@@ -160,7 +159,7 @@
           {
             title: '更新时间',
             dataIndex: 'updatedAt',
-            width: '150px',
+            width: '200px',
             sorter: true,
             scopedSlots: { customRender: 'updatedAt' },
           },
@@ -186,19 +185,19 @@
     },
     methods: {
 
-      handleChange (value, key, column) {
+      handleChange (value, key, column, record) {
         console.log(value, key, column)
+        record[column.dataIndex] = value
       },
       edit (row) {
         row.editable = true
         // row = Object.assign({}, row)
-        this.$refs.table.updateEdit()
       },
       // eslint-disable-next-line
       del (row) {
         this.$confirm({
           title: '警告',
-          content: '真的要删除吗?',
+          content: `真的要删除 ${row.no} 吗?`,
           okText: '删除',
           okType: 'danger',
           cancelText: '取消',
@@ -215,12 +214,10 @@
         })
       },
       save (row) {
-        delete row.editable
-        this.$refs.table.updateEdit()
+        row.editable = false
       },
       cancel (row) {
-        delete row.editable
-        this.$refs.table.updateEdit()
+        row.editable = false
       },
 
       onChange (row) {

src/views/list/TableList.vue

@@ -210,7 +210,7 @@
         mdl: {},
 
         // 高级搜索 展开/关闭
-        advanced: true,
+        advanced: false,
         // 查询参数
         queryParam: {},
         // 表头

src/views/list/TreeList.vue

@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <a-row :gutter="8">
       <a-col :span="5">
-        <s-tree :dataSource="orgTree" :search="true" @click="handleClick" @add="handleAdd" @titleClick="handleTitleClick"></s-tree>
+        <s-tree :dataSource="orgTree" :openKeys.sync="openKeys" :search="true" @click="handleClick" @add="handleAdd" @titleClick="handleTitleClick"></s-tree>
       </a-col>
       <a-col :span="19">
         <s-table
@@ -58,7 +58,7 @@ export default {
   },
   data () {
     return {
-      openKeys: ['sub1'],
+      openKeys: ['key-01'],
 
       // 查询参数
       queryParam: {},