iov-design 2.15.60 → 2.15.61

package/packages/table/src/util.js

@@ -1,273 +1,273 @@
-import { getValueByPath } from 'iov-design/src/utils/util';
-
-export const getCell = function(event) {
-  let cell = event.target;
-
-  while (cell && cell.tagName.toUpperCase() !== 'HTML') {
-    if (cell.tagName.toUpperCase() === 'TD') {
-      return cell;
-    }
-    cell = cell.parentNode;
-  }
-
-  return null;
-};
-
-const isObject = function(obj) {
-  return obj !== null && typeof obj === 'object';
-};
-
-export const orderBy = function(array, sortKey, reverse, sortMethod, sortBy) {
-  if (!sortKey && !sortMethod && (!sortBy || Array.isArray(sortBy) && !sortBy.length)) {
-    return array;
-  }
-  if (typeof reverse === 'string') {
-    reverse = reverse === 'descending' ? -1 : 1;
-  } else {
-    reverse = (reverse && reverse < 0) ? -1 : 1;
-  }
-  const getKey = sortMethod ? null : function(value, index) {
-    if (sortBy) {
-      if (!Array.isArray(sortBy)) {
-        sortBy = [sortBy];
-      }
-      return sortBy.map(function(by) {
-        if (typeof by === 'string') {
-          return getValueByPath(value, by);
-        } else {
-          return by(value, index, array);
-        }
-      });
-    }
-    if (sortKey !== '$key') {
-      if (isObject(value) && '$value' in value) value = value.$value;
-    }
-    return [isObject(value) ? getValueByPath(value, sortKey) : value];
-  };
-  const compare = function(a, b) {
-    if (sortMethod) {
-      return sortMethod(a.value, b.value);
-    }
-    for (let i = 0, len = a.key.length; i < len; i++) {
-      if (a.key[i] < b.key[i]) {
-        return -1;
-      }
-      if (a.key[i] > b.key[i]) {
-        return 1;
-      }
-    }
-    return 0;
-  };
-  return array.map(function(value, index) {
-    return {
-      value: value,
-      index: index,
-      key: getKey ? getKey(value, index) : null
-    };
-  }).sort(function(a, b) {
-    let order = compare(a, b);
-    if (!order) {
-      // make stable https://en.wikipedia.org/wiki/Sorting_algorithm#Stability
-      order = a.index - b.index;
-    }
-    return order * reverse;
-  }).map(item => item.value);
-};
-
-export const getColumnById = function(table, columnId) {
-  let column = null;
-  table.columns.forEach(function(item) {
-    if (item.id === columnId) {
-      column = item;
-    }
-  });
-  return column;
-};
-
-export const getColumnByKey = function(table, columnKey) {
-  let column = null;
-  for (let i = 0; i < table.columns.length; i++) {
-    const item = table.columns[i];
-    if (item.columnKey === columnKey) {
-      column = item;
-      break;
-    }
-  }
-  return column;
-};
-
-export const getColumnByCell = function(table, cell) {
-  const matches = (cell.className || '').match(/el-table_[^\s]+/gm);
-  if (matches) {
-    return getColumnById(table, matches[0]);
-  }
-  return null;
-};
-
-export const getRowIdentity = (row, rowKey) => {
-  if (!row) throw new Error('row is required when get row identity');
-  if (typeof rowKey === 'string') {
-    if (rowKey.indexOf('.') < 0) {
-      return row[rowKey];
-    }
-    let key = rowKey.split('.');
-    let current = row;
-    for (let i = 0; i < key.length; i++) {
-      current = current[key[i]];
-    }
-    return current;
-  } else if (typeof rowKey === 'function') {
-    return rowKey.call(null, row);
-  }
-};
-
-export const getKeysMap = function(array, rowKey) {
-  const arrayMap = {};
-  (array || []).forEach((row, index) => {
-    arrayMap[getRowIdentity(row, rowKey)] = { row, index };
-  });
-  return arrayMap;
-};
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-export function mergeOptions(defaults, config) {
-  const options = {};
-  let key;
-  for (key in defaults) {
-    options[key] = defaults[key];
-  }
-  for (key in config) {
-    if (hasOwn(config, key)) {
-      const value = config[key];
-      if (typeof value !== 'undefined') {
-        options[key] = value;
-      }
-    }
-  }
-  return options;
-}
-
-export function parseWidth(width) {
-  if (width !== undefined) {
-    width = parseInt(width, 10);
-    if (isNaN(width)) {
-      width = null;
-    }
-  }
-  return width;
-}
-
-export function parseMinWidth(minWidth) {
-  if (typeof minWidth !== 'undefined') {
-    minWidth = parseWidth(minWidth);
-    if (isNaN(minWidth)) {
-      minWidth = 80;
-    }
-  }
-  return minWidth;
-};
-
-export function parseHeight(height) {
-  if (typeof height === 'number') {
-    return height;
-  }
-  if (typeof height === 'string') {
-    if (/^\d+(?:px)?$/.test(height)) {
-      return parseInt(height, 10);
-    } else {
-      return height;
-    }
-  }
-  return null;
-}
-
-// https://github.com/reduxjs/redux/blob/master/src/compose.js
-export function compose(...funcs) {
-  if (funcs.length === 0) {
-    return arg => arg;
-  }
-  if (funcs.length === 1) {
-    return funcs[0];
-  }
-  return funcs.reduce((a, b) => (...args) => a(b(...args)));
-}
-
-export function toggleRowStatus(statusArr, row, newVal) {
-  let changed = false;
-  const index = statusArr.indexOf(row);
-  const included = index !== -1;
-
-  const addRow = () => {
-    statusArr.push(row);
-    changed = true;
-  };
-  const removeRow = () => {
-    statusArr.splice(index, 1);
-    changed = true;
-  };
-
-  if (typeof newVal === 'boolean') {
-    if (newVal && !included) {
-      addRow();
-    } else if (!newVal && included) {
-      removeRow();
-    }
-  } else {
-    if (included) {
-      removeRow();
-    } else {
-      addRow();
-    }
-  }
-  return changed;
-}
-
-export function walkTreeNode(root, cb, childrenKey = 'children', lazyKey = 'hasChildren') {
-  const isNil = (array) => !(Array.isArray(array) && array.length);
-
-  function _walker(parent, children, level) {
-    cb(parent, children, level);
-    children.forEach(item => {
-      if (item[lazyKey]) {
-        cb(item, null, level + 1);
-        return;
-      }
-      const children = item[childrenKey];
-      if (!isNil(children)) {
-        _walker(item, children, level + 1);
-      }
-    });
-  }
-
-  root.forEach(item => {
-    if (item[lazyKey]) {
-      cb(item, null, 0);
-      return;
-    }
-    const children = item[childrenKey];
-    if (!isNil(children)) {
-      _walker(item, children, 0);
-    }
-  });
-}
-
-export const objectEquals = function(objectA, objectB) {
-  // 取对象a和b的属性名
-  let aProps = Object.getOwnPropertyNames(objectA);
-  let bProps = Object.getOwnPropertyNames(objectB);
-  // 判断属性名的length是否一致
-  if (aProps.length !== bProps.length) {
-    return false;
-  }
-  // 循环取出属性名，再判断属性值是否一致
-  for (let i = 0; i < aProps.length; i++) {
-    let propName = aProps[i];
-    if (objectA[propName] !== objectB[propName]) {
-      return false;
-    }
-  }
-  return true;
-};
+import { getValueByPath } from 'iov-design/src/utils/util';
+
+export const getCell = function(event) {
+  let cell = event.target;
+
+  while (cell && cell.tagName.toUpperCase() !== 'HTML') {
+    if (cell.tagName.toUpperCase() === 'TD') {
+      return cell;
+    }
+    cell = cell.parentNode;
+  }
+
+  return null;
+};
+
+const isObject = function(obj) {
+  return obj !== null && typeof obj === 'object';
+};
+
+export const orderBy = function(array, sortKey, reverse, sortMethod, sortBy) {
+  if (!sortKey && !sortMethod && (!sortBy || Array.isArray(sortBy) && !sortBy.length)) {
+    return array;
+  }
+  if (typeof reverse === 'string') {
+    reverse = reverse === 'descending' ? -1 : 1;
+  } else {
+    reverse = (reverse && reverse < 0) ? -1 : 1;
+  }
+  const getKey = sortMethod ? null : function(value, index) {
+    if (sortBy) {
+      if (!Array.isArray(sortBy)) {
+        sortBy = [sortBy];
+      }
+      return sortBy.map(function(by) {
+        if (typeof by === 'string') {
+          return getValueByPath(value, by);
+        } else {
+          return by(value, index, array);
+        }
+      });
+    }
+    if (sortKey !== '$key') {
+      if (isObject(value) && '$value' in value) value = value.$value;
+    }
+    return [isObject(value) ? getValueByPath(value, sortKey) : value];
+  };
+  const compare = function(a, b) {
+    if (sortMethod) {
+      return sortMethod(a.value, b.value);
+    }
+    for (let i = 0, len = a.key.length; i < len; i++) {
+      if (a.key[i] < b.key[i]) {
+        return -1;
+      }
+      if (a.key[i] > b.key[i]) {
+        return 1;
+      }
+    }
+    return 0;
+  };
+  return array.map(function(value, index) {
+    return {
+      value: value,
+      index: index,
+      key: getKey ? getKey(value, index) : null
+    };
+  }).sort(function(a, b) {
+    let order = compare(a, b);
+    if (!order) {
+      // make stable https://en.wikipedia.org/wiki/Sorting_algorithm#Stability
+      order = a.index - b.index;
+    }
+    return order * reverse;
+  }).map(item => item.value);
+};
+
+export const getColumnById = function(table, columnId) {
+  let column = null;
+  table.columns.forEach(function(item) {
+    if (item.id === columnId) {
+      column = item;
+    }
+  });
+  return column;
+};
+
+export const getColumnByKey = function(table, columnKey) {
+  let column = null;
+  for (let i = 0; i < table.columns.length; i++) {
+    const item = table.columns[i];
+    if (item.columnKey === columnKey) {
+      column = item;
+      break;
+    }
+  }
+  return column;
+};
+
+export const getColumnByCell = function(table, cell) {
+  const matches = (cell.className || '').match(/el-table_[^\s]+/gm);
+  if (matches) {
+    return getColumnById(table, matches[0]);
+  }
+  return null;
+};
+
+export const getRowIdentity = (row, rowKey) => {
+  if (!row) throw new Error('row is required when get row identity');
+  if (typeof rowKey === 'string') {
+    if (rowKey.indexOf('.') < 0) {
+      return row[rowKey];
+    }
+    let key = rowKey.split('.');
+    let current = row;
+    for (let i = 0; i < key.length; i++) {
+      current = current[key[i]];
+    }
+    return current;
+  } else if (typeof rowKey === 'function') {
+    return rowKey.call(null, row);
+  }
+};
+
+export const getKeysMap = function(array, rowKey) {
+  const arrayMap = {};
+  (array || []).forEach((row, index) => {
+    arrayMap[getRowIdentity(row, rowKey)] = { row, index };
+  });
+  return arrayMap;
+};
+
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
+
+export function mergeOptions(defaults, config) {
+  const options = {};
+  let key;
+  for (key in defaults) {
+    options[key] = defaults[key];
+  }
+  for (key in config) {
+    if (hasOwn(config, key)) {
+      const value = config[key];
+      if (typeof value !== 'undefined') {
+        options[key] = value;
+      }
+    }
+  }
+  return options;
+}
+
+export function parseWidth(width) {
+  if (width !== undefined) {
+    width = parseInt(width, 10);
+    if (isNaN(width)) {
+      width = null;
+    }
+  }
+  return width;
+}
+
+export function parseMinWidth(minWidth) {
+  if (typeof minWidth !== 'undefined') {
+    minWidth = parseWidth(minWidth);
+    if (isNaN(minWidth)) {
+      minWidth = 80;
+    }
+  }
+  return minWidth;
+};
+
+export function parseHeight(height) {
+  if (typeof height === 'number') {
+    return height;
+  }
+  if (typeof height === 'string') {
+    if (/^\d+(?:px)?$/.test(height)) {
+      return parseInt(height, 10);
+    } else {
+      return height;
+    }
+  }
+  return null;
+}
+
+// https://github.com/reduxjs/redux/blob/master/src/compose.js
+export function compose(...funcs) {
+  if (funcs.length === 0) {
+    return arg => arg;
+  }
+  if (funcs.length === 1) {
+    return funcs[0];
+  }
+  return funcs.reduce((a, b) => (...args) => a(b(...args)));
+}
+
+export function toggleRowStatus(statusArr, row, newVal) {
+  let changed = false;
+  const index = statusArr.indexOf(row);
+  const included = index !== -1;
+
+  const addRow = () => {
+    statusArr.push(row);
+    changed = true;
+  };
+  const removeRow = () => {
+    statusArr.splice(index, 1);
+    changed = true;
+  };
+
+  if (typeof newVal === 'boolean') {
+    if (newVal && !included) {
+      addRow();
+    } else if (!newVal && included) {
+      removeRow();
+    }
+  } else {
+    if (included) {
+      removeRow();
+    } else {
+      addRow();
+    }
+  }
+  return changed;
+}
+
+export function walkTreeNode(root, cb, childrenKey = 'children', lazyKey = 'hasChildren') {
+  const isNil = (array) => !(Array.isArray(array) && array.length);
+
+  function _walker(parent, children, level) {
+    cb(parent, children, level);
+    children.forEach(item => {
+      if (item[lazyKey]) {
+        cb(item, null, level + 1);
+        return;
+      }
+      const children = item[childrenKey];
+      if (!isNil(children)) {
+        _walker(item, children, level + 1);
+      }
+    });
+  }
+
+  root.forEach(item => {
+    if (item[lazyKey]) {
+      cb(item, null, 0);
+      return;
+    }
+    const children = item[childrenKey];
+    if (!isNil(children)) {
+      _walker(item, children, 0);
+    }
+  });
+}
+
+export const objectEquals = function(objectA, objectB) {
+  // 取对象a和b的属性名
+  let aProps = Object.getOwnPropertyNames(objectA);
+  let bProps = Object.getOwnPropertyNames(objectB);
+  // 判断属性名的length是否一致
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  // 循环取出属性名，再判断属性值是否一致
+  for (let i = 0; i < aProps.length; i++) {
+    let propName = aProps[i];
+    if (objectA[propName] !== objectB[propName]) {
+      return false;
+    }
+  }
+  return true;
+};

package/packages/tabs/src/tab-bar.vue

@@ -1,57 +1,57 @@
-<template>
-  <div class="el-tabs__active-bar" :class="`is-${ rootTabs.tabPosition }`" :style="barStyle"></div>
-</template>
-<script>
-  import { arrayFind } from 'iov-design/src/utils/util';
-  export default {
-    name: 'TabBar',
-
-    props: {
-      tabs: Array
-    },
-
-    inject: ['rootTabs'],
-
-    computed: {
-      barStyle: {
-        get() {
-          let style = {};
-          let offset = 0;
-          let tabSize = 0;
-          const sizeName = ['top', 'bottom'].indexOf(this.rootTabs.tabPosition) !== -1 ? 'width' : 'height';
-          const sizeDir = sizeName === 'width' ? 'x' : 'y';
-          const firstUpperCase = str => {
-            return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
-          };
-          this.tabs.every((tab, index) => {
-            let $el = arrayFind(this.$parent.$refs.tabs || [], t => t.id.replace('tab-', '') === tab.paneName);
-            if (!$el) { return false; }
-
-            if (!tab.active) {
-              offset += $el[`client${firstUpperCase(sizeName)}`];
-              return true;
-            } else {
-              tabSize = $el[`client${firstUpperCase(sizeName)}`];
-              const tabStyles = window.getComputedStyle($el);
-              if (sizeName === 'width' && this.tabs.length > 1) {
-                tabSize -= parseFloat(tabStyles.paddingLeft) + parseFloat(tabStyles.paddingRight);
-              }
-              if (sizeName === 'width') {
-                offset += parseFloat(tabStyles.paddingLeft);
-              }
-              return false;
-            }
-          });
-
-          const transform = `translate${firstUpperCase(sizeDir)}(${offset + 4}px)`;
-          style[sizeName] = tabSize - 8 + 'px';
-          style.transform = transform;
-          style.msTransform = transform;
-          style.webkitTransform = transform;
-
-          return style;
-        }
-      }
-    }
-  };
-</script>
+<template>
+  <div class="el-tabs__active-bar" :class="`is-${ rootTabs.tabPosition }`" :style="barStyle"></div>
+</template>
+<script>
+  import { arrayFind } from 'iov-design/src/utils/util';
+  export default {
+    name: 'TabBar',
+
+    props: {
+      tabs: Array
+    },
+
+    inject: ['rootTabs'],
+
+    computed: {
+      barStyle: {
+        get() {
+          let style = {};
+          let offset = 0;
+          let tabSize = 0;
+          const sizeName = ['top', 'bottom'].indexOf(this.rootTabs.tabPosition) !== -1 ? 'width' : 'height';
+          const sizeDir = sizeName === 'width' ? 'x' : 'y';
+          const firstUpperCase = str => {
+            return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
+          };
+          this.tabs.every((tab, index) => {
+            let $el = arrayFind(this.$parent.$refs.tabs || [], t => t.id.replace('tab-', '') === tab.paneName);
+            if (!$el) { return false; }
+
+            if (!tab.active) {
+              offset += $el[`client${firstUpperCase(sizeName)}`];
+              return true;
+            } else {
+              tabSize = $el[`client${firstUpperCase(sizeName)}`];
+              const tabStyles = window.getComputedStyle($el);
+              if (sizeName === 'width' && this.tabs.length > 1) {
+                tabSize -= parseFloat(tabStyles.paddingLeft) + parseFloat(tabStyles.paddingRight);
+              }
+              if (sizeName === 'width') {
+                offset += parseFloat(tabStyles.paddingLeft);
+              }
+              return false;
+            }
+          });
+
+          const transform = `translate${firstUpperCase(sizeDir)}(${offset + 4}px)`;
+          style[sizeName] = tabSize - 8 + 'px';
+          style.transform = transform;
+          style.msTransform = transform;
+          style.webkitTransform = transform;
+
+          return style;
+        }
+      }
+    }
+  };
+</script>