iov-design 2.15.60 → 2.15.62

package/packages/table/src/filter-panel.vue

@@ -1,194 +1,194 @@
-<template>
-  <transition name="el-zoom-in-top">
-    <div
-      class="el-table-filter"
-      v-if="multiple"
-      v-clickoutside="handleOutsideClick"
-      v-show="showPopper">
-      <div class="el-table-filter__content">
-        <el-scrollbar wrap-class="el-table-filter__wrap">
-          <el-checkbox-group class="el-table-filter__checkbox-group" v-model="filteredValue">
-            <el-checkbox
-              v-for="filter in filters"
-              :key="filter.value"
-              :label="filter.value">{{ filter.text }}</el-checkbox>
-          </el-checkbox-group>
-        </el-scrollbar>
-      </div>
-      <div class="el-table-filter__bottom">
-        <button @click="handleConfirm"
-          :class="{ 'is-disabled': filteredValue.length === 0 }"
-          :disabled="filteredValue.length === 0">{{ t('el.table.confirmFilter') }}</button>
-        <button @click="handleReset">{{ t('el.table.resetFilter') }}</button>
-      </div>
-    </div>
-    <div
-      class="el-table-filter"
-      v-else
-      v-clickoutside="handleOutsideClick"
-      v-show="showPopper">
-      <ul class="el-table-filter__list">
-        <li class="el-table-filter__list-item"
-            :class="{ 'is-active': filterValue === undefined || filterValue === null }"
-            @click="handleSelect(null)">{{ t('el.table.clearFilter') }}</li>
-        <li class="el-table-filter__list-item"
-            v-for="filter in filters"
-            :label="filter.value"
-            :key="filter.value"
-            :class="{ 'is-active': isActive(filter) }"
-            @click="handleSelect(filter.value)" >{{ filter.text }}</li>
-      </ul>
-    </div>
-  </transition>
-</template>
-
-<script type="text/babel">
-  import Popper from 'iov-design/src/utils/vue-popper';
-  import { PopupManager } from 'iov-design/src/utils/popup';
-  import Locale from 'iov-design/src/mixins/locale';
-  import Clickoutside from 'iov-design/src/utils/clickoutside';
-  import Dropdown from './dropdown';
-  import ElCheckbox from 'iov-design/packages/checkbox';
-  import ElCheckboxGroup from 'iov-design/packages/checkbox-group';
-  import ElScrollbar from 'iov-design/packages/scrollbar';
-
-  export default {
-    name: 'ElTableFilterPanel',
-
-    mixins: [Popper, Locale],
-
-    directives: {
-      Clickoutside
-    },
-
-    components: {
-      ElCheckbox,
-      ElCheckboxGroup,
-      ElScrollbar
-    },
-
-    props: {
-      placement: {
-        type: String,
-        default: 'bottom-end'
-      }
-    },
-
-    methods: {
-      isActive(filter) {
-        return filter.value === this.filterValue;
-      },
-
-      handleOutsideClick() {
-        setTimeout(() => {
-          this.showPopper = false;
-        }, 16);
-      },
-
-      handleConfirm() {
-        this.confirmFilter(this.filteredValue);
-        this.handleOutsideClick();
-      },
-
-      handleReset() {
-        this.filteredValue = [];
-        this.confirmFilter(this.filteredValue);
-        this.handleOutsideClick();
-      },
-
-      handleSelect(filterValue) {
-        this.filterValue = filterValue;
-
-        if ((typeof filterValue !== 'undefined') && (filterValue !== null)) {
-          this.confirmFilter(this.filteredValue);
-        } else {
-          this.confirmFilter([]);
-        }
-
-        this.handleOutsideClick();
-      },
-
-      confirmFilter(filteredValue) {
-        this.table.store.commit('filterChange', {
-          column: this.column,
-          values: filteredValue
-        });
-        this.table.store.updateAllSelected();
-      }
-    },
-
-    data() {
-      return {
-        table: null,
-        cell: null,
-        column: null
-      };
-    },
-
-    computed: {
-      filters() {
-        return this.column && this.column.filters;
-      },
-
-      filterValue: {
-        get() {
-          return (this.column.filteredValue || [])[0];
-        },
-        set(value) {
-          if (this.filteredValue) {
-            if ((typeof value !== 'undefined') && (value !== null)) {
-              this.filteredValue.splice(0, 1, value);
-            } else {
-              this.filteredValue.splice(0, 1);
-            }
-          }
-        }
-      },
-
-      filteredValue: {
-        get() {
-          if (this.column) {
-            return this.column.filteredValue || [];
-          }
-          return [];
-        },
-        set(value) {
-          if (this.column) {
-            this.column.filteredValue = value;
-          }
-        }
-      },
-
-      multiple() {
-        if (this.column) {
-          return this.column.filterMultiple;
-        }
-        return true;
-      }
-    },
-
-    mounted() {
-      this.popperElm = this.$el;
-      this.referenceElm = this.cell;
-      this.table.bodyWrapper.addEventListener('scroll', () => {
-        this.updatePopper();
-      });
-
-      this.$watch('showPopper', (value) => {
-        if (this.column) this.column.filterOpened = value;
-        if (value) {
-          Dropdown.open(this);
-        } else {
-          Dropdown.close(this);
-        }
-      });
-    },
-    watch: {
-      showPopper(val) {
-        if (val === true && parseInt(this.popperJS._popper.style.zIndex, 10) < PopupManager.zIndex) {
-          this.popperJS._popper.style.zIndex = PopupManager.nextZIndex();
-        }
-      }
-    }
-  };
-</script>
+<template>
+  <transition name="el-zoom-in-top">
+    <div
+      class="el-table-filter"
+      v-if="multiple"
+      v-clickoutside="handleOutsideClick"
+      v-show="showPopper">
+      <div class="el-table-filter__content">
+        <el-scrollbar wrap-class="el-table-filter__wrap">
+          <el-checkbox-group class="el-table-filter__checkbox-group" v-model="filteredValue">
+            <el-checkbox
+              v-for="filter in filters"
+              :key="filter.value"
+              :label="filter.value">{{ filter.text }}</el-checkbox>
+          </el-checkbox-group>
+        </el-scrollbar>
+      </div>
+      <div class="el-table-filter__bottom">
+        <button @click="handleConfirm"
+          :class="{ 'is-disabled': filteredValue.length === 0 }"
+          :disabled="filteredValue.length === 0">{{ t('el.table.confirmFilter') }}</button>
+        <button @click="handleReset">{{ t('el.table.resetFilter') }}</button>
+      </div>
+    </div>
+    <div
+      class="el-table-filter"
+      v-else
+      v-clickoutside="handleOutsideClick"
+      v-show="showPopper">
+      <ul class="el-table-filter__list">
+        <li class="el-table-filter__list-item"
+            :class="{ 'is-active': filterValue === undefined || filterValue === null }"
+            @click="handleSelect(null)">{{ t('el.table.clearFilter') }}</li>
+        <li class="el-table-filter__list-item"
+            v-for="filter in filters"
+            :label="filter.value"
+            :key="filter.value"
+            :class="{ 'is-active': isActive(filter) }"
+            @click="handleSelect(filter.value)" >{{ filter.text }}</li>
+      </ul>
+    </div>
+  </transition>
+</template>
+
+<script type="text/babel">
+  import Popper from 'iov-design/src/utils/vue-popper';
+  import { PopupManager } from 'iov-design/src/utils/popup';
+  import Locale from 'iov-design/src/mixins/locale';
+  import Clickoutside from 'iov-design/src/utils/clickoutside';
+  import Dropdown from './dropdown';
+  import ElCheckbox from 'iov-design/packages/checkbox';
+  import ElCheckboxGroup from 'iov-design/packages/checkbox-group';
+  import ElScrollbar from 'iov-design/packages/scrollbar';
+
+  export default {
+    name: 'ElTableFilterPanel',
+
+    mixins: [Popper, Locale],
+
+    directives: {
+      Clickoutside
+    },
+
+    components: {
+      ElCheckbox,
+      ElCheckboxGroup,
+      ElScrollbar
+    },
+
+    props: {
+      placement: {
+        type: String,
+        default: 'bottom-end'
+      }
+    },
+
+    methods: {
+      isActive(filter) {
+        return filter.value === this.filterValue;
+      },
+
+      handleOutsideClick() {
+        setTimeout(() => {
+          this.showPopper = false;
+        }, 16);
+      },
+
+      handleConfirm() {
+        this.confirmFilter(this.filteredValue);
+        this.handleOutsideClick();
+      },
+
+      handleReset() {
+        this.filteredValue = [];
+        this.confirmFilter(this.filteredValue);
+        this.handleOutsideClick();
+      },
+
+      handleSelect(filterValue) {
+        this.filterValue = filterValue;
+
+        if ((typeof filterValue !== 'undefined') && (filterValue !== null)) {
+          this.confirmFilter(this.filteredValue);
+        } else {
+          this.confirmFilter([]);
+        }
+
+        this.handleOutsideClick();
+      },
+
+      confirmFilter(filteredValue) {
+        this.table.store.commit('filterChange', {
+          column: this.column,
+          values: filteredValue
+        });
+        this.table.store.updateAllSelected();
+      }
+    },
+
+    data() {
+      return {
+        table: null,
+        cell: null,
+        column: null
+      };
+    },
+
+    computed: {
+      filters() {
+        return this.column && this.column.filters;
+      },
+
+      filterValue: {
+        get() {
+          return (this.column.filteredValue || [])[0];
+        },
+        set(value) {
+          if (this.filteredValue) {
+            if ((typeof value !== 'undefined') && (value !== null)) {
+              this.filteredValue.splice(0, 1, value);
+            } else {
+              this.filteredValue.splice(0, 1);
+            }
+          }
+        }
+      },
+
+      filteredValue: {
+        get() {
+          if (this.column) {
+            return this.column.filteredValue || [];
+          }
+          return [];
+        },
+        set(value) {
+          if (this.column) {
+            this.column.filteredValue = value;
+          }
+        }
+      },
+
+      multiple() {
+        if (this.column) {
+          return this.column.filterMultiple;
+        }
+        return true;
+      }
+    },
+
+    mounted() {
+      this.popperElm = this.$el;
+      this.referenceElm = this.cell;
+      this.table.bodyWrapper.addEventListener('scroll', () => {
+        this.updatePopper();
+      });
+
+      this.$watch('showPopper', (value) => {
+        if (this.column) this.column.filterOpened = value;
+        if (value) {
+          Dropdown.open(this);
+        } else {
+          Dropdown.close(this);
+        }
+      });
+    },
+    watch: {
+      showPopper(val) {
+        if (val === true && parseInt(this.popperJS._popper.style.zIndex, 10) < PopupManager.zIndex) {
+          this.popperJS._popper.style.zIndex = PopupManager.nextZIndex();
+        }
+      }
+    }
+  };
+</script>

package/packages/table/src/store/current.js

@@ -1,76 +1,76 @@
-import { arrayFind } from 'iov-design/src/utils/util';
-import { getRowIdentity } from '../util';
-
-export default {
-  data() {
-    return {
-      states: {
-        // 不可响应的，设置 currentRowKey 时，data 不一定存在，也许无法算出正确的 currentRow
-        // 把该值缓存一下，当用户点击修改 currentRow 时，把该值重置为 null
-        _currentRowKey: null,
-        currentRow: null
-      }
-    };
-  },
-
-  methods: {
-    setCurrentRowKey(key) {
-      this.assertRowKey();
-      this.states._currentRowKey = key;
-      this.setCurrentRowByKey(key);
-    },
-
-    restoreCurrentRowKey() {
-      this.states._currentRowKey = null;
-    },
-
-    setCurrentRowByKey(key) {
-      const { states } = this;
-      const { data = [], rowKey } = states;
-      let currentRow = null;
-      if (rowKey) {
-        currentRow = arrayFind(data, item => getRowIdentity(item, rowKey) === key);
-      }
-      states.currentRow = currentRow;
-    },
-
-    updateCurrentRow(currentRow) {
-      const { states, table } = this;
-      const oldCurrentRow = states.currentRow;
-      if (currentRow && currentRow !== oldCurrentRow) {
-        states.currentRow = currentRow;
-        table.$emit('current-change', currentRow, oldCurrentRow);
-        return;
-      }
-      if (!currentRow && oldCurrentRow) {
-        states.currentRow = null;
-        table.$emit('current-change', null, oldCurrentRow);
-      }
-    },
-
-    updateCurrentRowData() {
-      const { states, table } = this;
-      const { rowKey, _currentRowKey } = states;
-      // data 为 null 时，解构时的默认值会被忽略
-      const data = states.data || [];
-      const oldCurrentRow = states.currentRow;
-
-      // 当 currentRow 不在 data 中时尝试更新数据
-      if (data.indexOf(oldCurrentRow) === -1 && oldCurrentRow) {
-        if (rowKey) {
-          const currentRowKey = getRowIdentity(oldCurrentRow, rowKey);
-          this.setCurrentRowByKey(currentRowKey);
-        } else {
-          states.currentRow = null;
-        }
-        if (states.currentRow === null) {
-          table.$emit('current-change', null, oldCurrentRow);
-        }
-      } else if (_currentRowKey) {
-        // 把初始时下设置的 rowKey 转化成 rowData
-        this.setCurrentRowByKey(_currentRowKey);
-        this.restoreCurrentRowKey();
-      }
-    }
-  }
-};
+import { arrayFind } from 'iov-design/src/utils/util';
+import { getRowIdentity } from '../util';
+
+export default {
+  data() {
+    return {
+      states: {
+        // 不可响应的，设置 currentRowKey 时，data 不一定存在，也许无法算出正确的 currentRow
+        // 把该值缓存一下，当用户点击修改 currentRow 时，把该值重置为 null
+        _currentRowKey: null,
+        currentRow: null
+      }
+    };
+  },
+
+  methods: {
+    setCurrentRowKey(key) {
+      this.assertRowKey();
+      this.states._currentRowKey = key;
+      this.setCurrentRowByKey(key);
+    },
+
+    restoreCurrentRowKey() {
+      this.states._currentRowKey = null;
+    },
+
+    setCurrentRowByKey(key) {
+      const { states } = this;
+      const { data = [], rowKey } = states;
+      let currentRow = null;
+      if (rowKey) {
+        currentRow = arrayFind(data, item => getRowIdentity(item, rowKey) === key);
+      }
+      states.currentRow = currentRow;
+    },
+
+    updateCurrentRow(currentRow) {
+      const { states, table } = this;
+      const oldCurrentRow = states.currentRow;
+      if (currentRow && currentRow !== oldCurrentRow) {
+        states.currentRow = currentRow;
+        table.$emit('current-change', currentRow, oldCurrentRow);
+        return;
+      }
+      if (!currentRow && oldCurrentRow) {
+        states.currentRow = null;
+        table.$emit('current-change', null, oldCurrentRow);
+      }
+    },
+
+    updateCurrentRowData() {
+      const { states, table } = this;
+      const { rowKey, _currentRowKey } = states;
+      // data 为 null 时，解构时的默认值会被忽略
+      const data = states.data || [];
+      const oldCurrentRow = states.currentRow;
+
+      // 当 currentRow 不在 data 中时尝试更新数据
+      if (data.indexOf(oldCurrentRow) === -1 && oldCurrentRow) {
+        if (rowKey) {
+          const currentRowKey = getRowIdentity(oldCurrentRow, rowKey);
+          this.setCurrentRowByKey(currentRowKey);
+        } else {
+          states.currentRow = null;
+        }
+        if (states.currentRow === null) {
+          table.$emit('current-change', null, oldCurrentRow);
+        }
+      } else if (_currentRowKey) {
+        // 把初始时下设置的 rowKey 转化成 rowData
+        this.setCurrentRowByKey(_currentRowKey);
+        this.restoreCurrentRowKey();
+      }
+    }
+  }
+};

package/packages/table/src/store/helper.js

@@ -1,41 +1,41 @@
-import Store from './index';
-import debounce from 'throttle-debounce/debounce';
-
-export function createStore(table, initialState = {}) {
-  if (!table) {
-    throw new Error('Table is required.');
-  }
-
-  const store = new Store();
-  store.table = table;
-  // fix https://github.com/ElemeFE/element/issues/14075
-  // related pr https://github.com/ElemeFE/element/pull/14146
-  store.toggleAllSelection = debounce(10, store._toggleAllSelection);
-  Object.keys(initialState).forEach(key => {
-    store.states[key] = initialState[key];
-  });
-  return store;
-}
-
-export function mapStates(mapper) {
-  const res = {};
-  Object.keys(mapper).forEach(key => {
-    const value = mapper[key];
-    let fn;
-    if (typeof value === 'string') {
-      fn = function() {
-        return this.store.states[value];
-      };
-    } else if (typeof value === 'function') {
-      fn = function() {
-        return value.call(this, this.store.states);
-      };
-    } else {
-      console.error('invalid value type');
-    }
-    if (fn) {
-      res[key] = fn;
-    }
-  });
-  return res;
-};
+import Store from './index';
+import debounce from 'throttle-debounce/debounce';
+
+export function createStore(table, initialState = {}) {
+  if (!table) {
+    throw new Error('Table is required.');
+  }
+
+  const store = new Store();
+  store.table = table;
+  // fix https://github.com/ElemeFE/element/issues/14075
+  // related pr https://github.com/ElemeFE/element/pull/14146
+  store.toggleAllSelection = debounce(10, store._toggleAllSelection);
+  Object.keys(initialState).forEach(key => {
+    store.states[key] = initialState[key];
+  });
+  return store;
+}
+
+export function mapStates(mapper) {
+  const res = {};
+  Object.keys(mapper).forEach(key => {
+    const value = mapper[key];
+    let fn;
+    if (typeof value === 'string') {
+      fn = function() {
+        return this.store.states[value];
+      };
+    } else if (typeof value === 'function') {
+      fn = function() {
+        return value.call(this, this.store.states);
+      };
+    } else {
+      console.error('invalid value type');
+    }
+    if (fn) {
+      res[key] = fn;
+    }
+  });
+  return res;
+};