vue2-client 1.7.0 → 1.7.2

package/src/components/table/StandardTable.vue

@@ -1,141 +1,141 @@
-<template>
-  <div class="standard-table">
-    <div class="alert">
-      <a-alert v-if="selectedRows" :show-icon="true" type="info">
-        <div slot="message" class="message">
-          已选择&nbsp;<a>{{ selectedRows.length }}</a>&nbsp;项 <a class="clear" @click="onClear">清空</a>
-          <template v-for="(item, index) in needTotalList" >
-            <div v-if="item.needTotal" :key="index">
-              {{ item.title }}总计&nbsp;
-              <a>{{ item.customRender ? item.customRender(item.total) : item.total }}</a>
-            </div>
-          </template>
-        </div>
-      </a-alert>
-    </div>
-    <a-table
-      :bordered="bordered"
-      :columns="columns"
-      :dataSource="dataSource"
-      :expandedRowKeys="expandedRowKeys"
-      :expandedRowRender="expandedRowRender"
-      :loading="loading"
-      :pagination="pagination"
-      :rowKey="rowKey"
-      :rowSelection="selectedRows ? {selectedRowKeys: selectedRowKeys, onChange: updateSelect} : undefined"
-      @change="onChange"
-    >
-      <template v-for="slot in Object.keys($scopedSlots).filter(key => key !== 'expandedRowRender') " :slot="slot" slot-scope="text, record, index">
-        <slot :name="slot" v-bind="{text, record, index}"></slot>
-      </template>
-      <template v-for="slot in Object.keys($slots)" :slot="slot">
-        <slot :name="slot"></slot>
-      </template>
-      <template :slot="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''" slot-scope="record, index, indent, expanded">
-        <slot :name="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''" v-bind="{record, index, indent, expanded}"></slot>
-      </template>
-    </a-table>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'StandardTable',
-  props: {
-    bordered: Boolean,
-    // eslint-disable-next-line vue/require-default-prop
-    loading: [Boolean, Object],
-    // eslint-disable-next-line vue/require-default-prop
-    columns: Array,
-    // eslint-disable-next-line vue/require-default-prop
-    dataSource: Array,
-    rowKey: {
-      type: [String, Function],
-      default: 'key'
-    },
-    pagination: {
-      type: [Object, Boolean],
-      default: true
-    },
-    // eslint-disable-next-line vue/require-default-prop
-    selectedRows: Array,
-    // eslint-disable-next-line vue/require-default-prop
-    expandedRowKeys: Array,
-    // eslint-disable-next-line vue/require-default-prop
-    expandedRowRender: Function
-  },
-  data () {
-    return {
-      needTotalList: []
-    }
-  },
-  methods: {
-    updateSelect (selectedRowKeys, selectedRows) {
-      this.$emit('update:selectedRows', selectedRows)
-      this.$emit('selectedRowChange', selectedRowKeys, selectedRows)
-    },
-    initTotalList (columns) {
-      return columns.filter(item => item.needTotal)
-        .map(item => {
-          return {
-            ...item,
-            total: 0
-          }
-        })
-    },
-    onClear () {
-      this.updateSelect([], [])
-      this.$emit('clear')
-    },
-    onChange (pagination, filters, sorter, { currentDataSource }) {
-      this.$emit('change', pagination, filters, sorter, { currentDataSource })
-    }
-  },
-  created () {
-    this.needTotalList = this.initTotalList(this.columns)
-  },
-  watch: {
-    selectedRows (selectedRows) {
-      this.needTotalList = this.needTotalList.map(item => {
-        return {
-          ...item,
-          total: selectedRows.reduce((sum, val) => {
-            let v
-            try {
-              // eslint-disable-next-line no-eval
-              v = val[item.dataIndex] ? val[item.dataIndex] : eval(`val.${item.dataIndex}`)
-            } catch (_) {
-              v = val[item.dataIndex]
-            }
-            v = !isNaN(parseFloat(v)) ? parseFloat(v) : 0
-            return sum + v
-          }, 0)
-        }
-      })
-    }
-  },
-  computed: {
-    selectedRowKeys () {
-      return this.selectedRows.map(record => {
-        return (typeof this.rowKey === 'function') ? this.rowKey(record) : record[this.rowKey]
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.standard-table{
-  .alert{
-    margin-bottom: 16px;
-    .message{
-      a{
-        font-weight: 600;
-      }
-    }
-    .clear{
-      float: right;
-    }
-  }
-}
-</style>
+<template>
+  <div class="standard-table">
+    <div class="alert">
+      <a-alert v-if="selectedRows" :show-icon="true" type="info">
+        <div slot="message" class="message">
+          已选择&nbsp;<a>{{ selectedRows.length }}</a>&nbsp;项 <a class="clear" @click="onClear">清空</a>
+          <template v-for="(item, index) in needTotalList" >
+            <div v-if="item.needTotal" :key="index">
+              {{ item.title }}总计&nbsp;
+              <a>{{ item.customRender ? item.customRender(item.total) : item.total }}</a>
+            </div>
+          </template>
+        </div>
+      </a-alert>
+    </div>
+    <a-table
+      :bordered="bordered"
+      :columns="columns"
+      :dataSource="dataSource"
+      :expandedRowKeys="expandedRowKeys"
+      :expandedRowRender="expandedRowRender"
+      :loading="loading"
+      :pagination="pagination"
+      :rowKey="rowKey"
+      :rowSelection="selectedRows ? {selectedRowKeys: selectedRowKeys, onChange: updateSelect} : undefined"
+      @change="onChange"
+    >
+      <template v-for="slot in Object.keys($scopedSlots).filter(key => key !== 'expandedRowRender') " :slot="slot" slot-scope="text, record, index">
+        <slot :name="slot" v-bind="{text, record, index}"></slot>
+      </template>
+      <template v-for="slot in Object.keys($slots)" :slot="slot">
+        <slot :name="slot"></slot>
+      </template>
+      <template :slot="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''" slot-scope="record, index, indent, expanded">
+        <slot :name="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''" v-bind="{record, index, indent, expanded}"></slot>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'StandardTable',
+  props: {
+    bordered: Boolean,
+    // eslint-disable-next-line vue/require-default-prop
+    loading: [Boolean, Object],
+    // eslint-disable-next-line vue/require-default-prop
+    columns: Array,
+    // eslint-disable-next-line vue/require-default-prop
+    dataSource: Array,
+    rowKey: {
+      type: [String, Function],
+      default: 'key'
+    },
+    pagination: {
+      type: [Object, Boolean],
+      default: true
+    },
+    // eslint-disable-next-line vue/require-default-prop
+    selectedRows: Array,
+    // eslint-disable-next-line vue/require-default-prop
+    expandedRowKeys: Array,
+    // eslint-disable-next-line vue/require-default-prop
+    expandedRowRender: Function
+  },
+  data () {
+    return {
+      needTotalList: []
+    }
+  },
+  methods: {
+    updateSelect (selectedRowKeys, selectedRows) {
+      this.$emit('update:selectedRows', selectedRows)
+      this.$emit('selectedRowChange', selectedRowKeys, selectedRows)
+    },
+    initTotalList (columns) {
+      return columns.filter(item => item.needTotal)
+        .map(item => {
+          return {
+            ...item,
+            total: 0
+          }
+        })
+    },
+    onClear () {
+      this.updateSelect([], [])
+      this.$emit('clear')
+    },
+    onChange (pagination, filters, sorter, { currentDataSource }) {
+      this.$emit('change', pagination, filters, sorter, { currentDataSource })
+    }
+  },
+  created () {
+    this.needTotalList = this.initTotalList(this.columns)
+  },
+  watch: {
+    selectedRows (selectedRows) {
+      this.needTotalList = this.needTotalList.map(item => {
+        return {
+          ...item,
+          total: selectedRows.reduce((sum, val) => {
+            let v
+            try {
+              // eslint-disable-next-line no-eval
+              v = val[item.dataIndex] ? val[item.dataIndex] : eval(`val.${item.dataIndex}`)
+            } catch (_) {
+              v = val[item.dataIndex]
+            }
+            v = !isNaN(parseFloat(v)) ? parseFloat(v) : 0
+            return sum + v
+          }, 0)
+        }
+      })
+    }
+  },
+  computed: {
+    selectedRowKeys () {
+      return this.selectedRows.map(record => {
+        return (typeof this.rowKey === 'function') ? this.rowKey(record) : record[this.rowKey]
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.standard-table{
+  .alert{
+    margin-bottom: 16px;
+    .message{
+      a{
+        font-weight: 600;
+      }
+    }
+    .clear{
+      float: right;
+    }
+  }
+}
+</style>

package/src/components/table/advance/ActionColumns.vue

@@ -1,158 +1,158 @@
-<template>
-  <div class="action-columns" ref="root">
-    <a-popover v-model="visible" placement="bottomRight" trigger="click" :get-popup-container="() => $refs.root">
-      <div slot="title">
-        <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange" class="check-all" />列展示
-        <a-button @click="resetColumns" style="float: right" type="link" size="small">重置</a-button>
-      </div>
-      <a-list style="width: 100%" size="small" :key="i" v-for="(col, i) in columns" slot="content">
-        <a-list-item>
-          <a-checkbox v-model="col.visible" @change="e => onCheckChange(e, col)"/>
-          <template v-if="col.title">
-            {{ col.title }}:
-          </template>
-          <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
-          <template slot="actions">
-            <a-tooltip title="固定在列头" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
-              <a-icon :class="['left', {active: col.fixed === 'left'}]" @click="fixColumn('left', col)" type="vertical-align-top" />
-            </a-tooltip>
-            <a-tooltip title="固定在列尾" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
-              <a-icon :class="['right', {active: col.fixed === 'right'}]" @click="fixColumn('right', col)" type="vertical-align-bottom" />
-            </a-tooltip>
-            <a-tooltip title="添加搜索" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
-              <a-icon :class="{active: col.searchAble}" @click="setSearch(col)" type="search" />
-            </a-tooltip>
-          </template>
-        </a-list-item>
-      </a-list>
-      <a-icon class="action" type="setting" />
-    </a-popover>
-  </div>
-</template>
-
-<script>
-  import cloneDeep from 'lodash.clonedeep'
-
-  export default {
-    name: 'ActionColumns',
-    // eslint-disable-next-line vue/require-prop-types
-    props: ['columns', 'visibleColumns'],
-    data () {
-      return {
-        visible: false,
-        indeterminate: false,
-        checkAll: true,
-        checkedCounts: this.columns.length,
-        backColumns: cloneDeep(this.columns)
-      }
-    },
-    watch: {
-      checkedCounts (val) {
-        this.checkAll = val === this.columns.length
-        this.indeterminate = val > 0 && val < this.columns.length
-      },
-      columns (newVal, oldVal) {
-        if (newVal !== oldVal) {
-          this.checkedCounts = newVal.length
-          this.formatColumns(newVal)
-        }
-      }
-    },
-    created () {
-      this.formatColumns(this.columns)
-    },
-    methods: {
-      onCheckChange (e, col) {
-        if (!col.visible) {
-          this.checkedCounts -= 1
-        } else {
-          this.checkedCounts += 1
-        }
-      },
-      fixColumn (fixed, col) {
-        if (fixed !== col.fixed) {
-          this.$set(col, 'fixed', fixed)
-        } else {
-          this.$set(col, 'fixed', undefined)
-        }
-      },
-      setSearch (col) {
-        this.$set(col, 'searchAble', !col.searchAble)
-        if (!col.searchAble && col.search) {
-          this.resetSearch(col)
-        }
-      },
-      resetSearch (col) {
-        // col.search.value = col.dataType === 'boolean' ? false : undefined
-        col.search.value = undefined
-        col.search.backup = undefined
-      },
-      resetColumns () {
-        const { columns, backColumns } = this
-        let counts = columns.length
-        backColumns.forEach((back, index) => {
-          const column = columns[index]
-          column.visible = back.visible === undefined || back.visible
-          if (!column.visible) {
-            counts -= 1
-          }
-          if (back.fixed !== undefined) {
-            column.fixed = back.fixed
-          } else {
-            this.$set(column, 'fixed', undefined)
-          }
-          this.$set(column, 'searchAble', back.searchAble)
-          // column.searchAble = back.searchAble
-          this.resetSearch(column)
-        })
-        this.checkedCounts = counts
-        this.visible = false
-        this.$emit('reset', this.getConditions(columns))
-      },
-      onCheckAllChange (e) {
-        if (e.target.checked) {
-          this.checkedCounts = this.columns.length
-          // eslint-disable-next-line no-return-assign
-          this.columns.forEach(col => col.visible = true)
-        } else {
-          this.checkedCounts = 0
-          // eslint-disable-next-line no-return-assign
-          this.columns.forEach(col => col.visible = false)
-        }
-      },
-      getConditions (columns) {
-        const conditions = {}
-        columns.filter(item => item.search.value !== undefined && item.search.value !== '' && item.search.value !== null)
-          .forEach(col => {
-            conditions[col.dataIndex] = col.search.value
-          })
-        return conditions
-      },
-      formatColumns (columns) {
-        for (const col of columns) {
-          if (col.visible === undefined) {
-            this.$set(col, 'visible', true)
-          }
-          if (!col.visible) {
-            this.checkedCounts -= 1
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped lang="less">
-.action-columns{
-  display: inline-block;
-  .check-all{
-    margin-right: 8px;
-  }
-  .left,.right{
-    transform: rotate(-90deg);
-  }
-  .active{
-    color: @primary-color;
-  }
-}
-</style>
+<template>
+  <div class="action-columns" ref="root">
+    <a-popover v-model="visible" placement="bottomRight" trigger="click" :get-popup-container="() => $refs.root">
+      <div slot="title">
+        <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange" class="check-all" />列展示
+        <a-button @click="resetColumns" style="float: right" type="link" size="small">重置</a-button>
+      </div>
+      <a-list style="width: 100%" size="small" :key="i" v-for="(col, i) in columns" slot="content">
+        <a-list-item>
+          <a-checkbox v-model="col.visible" @change="e => onCheckChange(e, col)"/>
+          <template v-if="col.title">
+            {{ col.title }}:
+          </template>
+          <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+          <template slot="actions">
+            <a-tooltip title="固定在列头" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+              <a-icon :class="['left', {active: col.fixed === 'left'}]" @click="fixColumn('left', col)" type="vertical-align-top" />
+            </a-tooltip>
+            <a-tooltip title="固定在列尾" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+              <a-icon :class="['right', {active: col.fixed === 'right'}]" @click="fixColumn('right', col)" type="vertical-align-bottom" />
+            </a-tooltip>
+            <a-tooltip title="添加搜索" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+              <a-icon :class="{active: col.searchAble}" @click="setSearch(col)" type="search" />
+            </a-tooltip>
+          </template>
+        </a-list-item>
+      </a-list>
+      <a-icon class="action" type="setting" />
+    </a-popover>
+  </div>
+</template>
+
+<script>
+  import cloneDeep from 'lodash.clonedeep'
+
+  export default {
+    name: 'ActionColumns',
+    // eslint-disable-next-line vue/require-prop-types
+    props: ['columns', 'visibleColumns'],
+    data () {
+      return {
+        visible: false,
+        indeterminate: false,
+        checkAll: true,
+        checkedCounts: this.columns.length,
+        backColumns: cloneDeep(this.columns)
+      }
+    },
+    watch: {
+      checkedCounts (val) {
+        this.checkAll = val === this.columns.length
+        this.indeterminate = val > 0 && val < this.columns.length
+      },
+      columns (newVal, oldVal) {
+        if (newVal !== oldVal) {
+          this.checkedCounts = newVal.length
+          this.formatColumns(newVal)
+        }
+      }
+    },
+    created () {
+      this.formatColumns(this.columns)
+    },
+    methods: {
+      onCheckChange (e, col) {
+        if (!col.visible) {
+          this.checkedCounts -= 1
+        } else {
+          this.checkedCounts += 1
+        }
+      },
+      fixColumn (fixed, col) {
+        if (fixed !== col.fixed) {
+          this.$set(col, 'fixed', fixed)
+        } else {
+          this.$set(col, 'fixed', undefined)
+        }
+      },
+      setSearch (col) {
+        this.$set(col, 'searchAble', !col.searchAble)
+        if (!col.searchAble && col.search) {
+          this.resetSearch(col)
+        }
+      },
+      resetSearch (col) {
+        // col.search.value = col.dataType === 'boolean' ? false : undefined
+        col.search.value = undefined
+        col.search.backup = undefined
+      },
+      resetColumns () {
+        const { columns, backColumns } = this
+        let counts = columns.length
+        backColumns.forEach((back, index) => {
+          const column = columns[index]
+          column.visible = back.visible === undefined || back.visible
+          if (!column.visible) {
+            counts -= 1
+          }
+          if (back.fixed !== undefined) {
+            column.fixed = back.fixed
+          } else {
+            this.$set(column, 'fixed', undefined)
+          }
+          this.$set(column, 'searchAble', back.searchAble)
+          // column.searchAble = back.searchAble
+          this.resetSearch(column)
+        })
+        this.checkedCounts = counts
+        this.visible = false
+        this.$emit('reset', this.getConditions(columns))
+      },
+      onCheckAllChange (e) {
+        if (e.target.checked) {
+          this.checkedCounts = this.columns.length
+          // eslint-disable-next-line no-return-assign
+          this.columns.forEach(col => col.visible = true)
+        } else {
+          this.checkedCounts = 0
+          // eslint-disable-next-line no-return-assign
+          this.columns.forEach(col => col.visible = false)
+        }
+      },
+      getConditions (columns) {
+        const conditions = {}
+        columns.filter(item => item.search.value !== undefined && item.search.value !== '' && item.search.value !== null)
+          .forEach(col => {
+            conditions[col.dataIndex] = col.search.value
+          })
+        return conditions
+      },
+      formatColumns (columns) {
+        for (const col of columns) {
+          if (col.visible === undefined) {
+            this.$set(col, 'visible', true)
+          }
+          if (!col.visible) {
+            this.checkedCounts -= 1
+          }
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.action-columns{
+  display: inline-block;
+  .check-all{
+    margin-right: 8px;
+  }
+  .left,.right{
+    transform: rotate(-90deg);
+  }
+  .active{
+    color: @primary-color;
+  }
+}
+</style>