bug修复

src/components/org-tree/index.js

@@ -0,0 +1,8 @@
+import Tree from './src/tree.vue';
+
+/* istanbul ignore next */
+Tree.install = function(Vue) {
+  Vue.component(Tree.name, Tree);
+};
+
+export default Tree;

src/components/org-tree/src/model/node.js

@@ -0,0 +1,486 @@
+import objectAssign from 'element-ui/src/utils/merge';
+import { markNodeData, NODE_KEY } from './util';
+import { arrayFindIndex } from 'element-ui/src/utils/util';
+
+export const getChildState = node => {
+  let all = true;
+  let none = true;
+  let allWithoutDisable = true;
+  for (let i = 0, j = node.length; i < j; i++) {
+    const n = node[i];
+    if (n.checked !== true || n.indeterminate) {
+      all = false;
+      if (!n.disabled) {
+        allWithoutDisable = false;
+      }
+    }
+    if (n.checked !== false || n.indeterminate) {
+      none = false;
+    }
+  }
+
+  return { all, none, allWithoutDisable, half: !all && !none };
+};
+
+const reInitChecked = function(node) {
+  if (node.childNodes.length === 0) return;
+
+  const {all, none, half} = getChildState(node.childNodes);
+  if (all) {
+    node.checked = true;
+    node.indeterminate = false;
+  } else if (half) {
+    node.checked = false;
+    node.indeterminate = true;
+  } else if (none) {
+    node.checked = false;
+    node.indeterminate = false;
+  }
+
+  const parent = node.parent;
+  if (!parent || parent.level === 0) return;
+
+  if (!node.store.checkStrictly) {
+    reInitChecked(parent);
+  }
+};
+
+const getPropertyFromData = function(node, prop) {
+  const props = node.store.props;
+  const data = node.data || {};
+  const config = props[prop];
+
+  if (typeof config === 'function') {
+    return config(data, node);
+  } else if (typeof config === 'string') {
+    return data[config];
+  } else if (typeof config === 'undefined') {
+    const dataProp = data[prop];
+    return dataProp === undefined ? '' : dataProp;
+  }
+};
+
+let nodeIdSeed = 0;
+
+export default class Node {
+  constructor(options) {
+    this.id = nodeIdSeed++;
+    this.text = null;
+    this.checked = false;
+    this.indeterminate = false;
+    this.data = null;
+    this.expanded = false;
+    this.parent = null;
+    this.visible = true;
+    this.isCurrent = false;
+
+    for (let name in options) {
+      if (options.hasOwnProperty(name)) {
+        this[name] = options[name];
+      }
+    }
+
+    // internal
+    this.level = 0;
+    this.loaded = false;
+    this.childNodes = [];
+    this.loading = false;
+
+    if (this.parent) {
+      this.level = this.parent.level + 1;
+    }
+
+    const store = this.store;
+    if (!store) {
+      throw new Error('[Node]store is required!');
+    }
+    store.registerNode(this);
+
+    const props = store.props;
+    if (props && typeof props.isLeaf !== 'undefined') {
+      const isLeaf = getPropertyFromData(this, 'isLeaf');
+      if (typeof isLeaf === 'boolean') {
+        this.isLeafByUser = isLeaf;
+      }
+    }
+
+    if (store.lazy !== true && this.data) {
+      this.setData(this.data);
+
+      if (store.defaultExpandAll) {
+        this.expanded = true;
+      }
+    } else if (this.level > 0 && store.lazy && store.defaultExpandAll) {
+      this.expand();
+    }
+    if (!Array.isArray(this.data)) {
+      markNodeData(this, this.data);
+    }
+    if (!this.data) return;
+    const defaultExpandedKeys = store.defaultExpandedKeys;
+    const key = store.key;
+    if (key && defaultExpandedKeys && defaultExpandedKeys.indexOf(this.key) !== -1) {
+      this.expand(null, store.autoExpandParent);
+    }
+
+    if (key && store.currentNodeKey !== undefined && this.key === store.currentNodeKey) {
+      store.currentNode = this;
+      store.currentNode.isCurrent = true;
+    }
+
+    if (store.lazy) {
+      store._initDefaultCheckedNode(this);
+    }
+
+    this.updateLeafState();
+  }
+
+  setData(data) {
+    if (!Array.isArray(data)) {
+      markNodeData(this, data);
+    }
+
+    this.data = data;
+    this.childNodes = [];
+
+    let children;
+    if (this.level === 0 && this.data instanceof Array) {
+      children = this.data;
+    } else {
+      children = getPropertyFromData(this, 'children') || [];
+    }
+
+    for (let i = 0, j = children.length; i < j; i++) {
+      this.insertChild({ data: children[i] });
+    }
+  }
+
+  get label() {
+    return getPropertyFromData(this, 'label');
+  }
+
+  get key() {
+    const nodeKey = this.store.key;
+    if (this.data) return this.data[nodeKey];
+    return null;
+  }
+
+  get disabled() {
+    return getPropertyFromData(this, 'disabled');
+  }
+
+  get nextSibling() {
+    const parent = this.parent;
+    if (parent) {
+      const index = parent.childNodes.indexOf(this);
+      if (index > -1) {
+        return parent.childNodes[index + 1];
+      }
+    }
+    return null;
+  }
+
+  get previousSibling() {
+    const parent = this.parent;
+    if (parent) {
+      const index = parent.childNodes.indexOf(this);
+      if (index > -1) {
+        return index > 0 ? parent.childNodes[index - 1] : null;
+      }
+    }
+    return null;
+  }
+
+  contains(target, deep = true) {
+    const walk = function(parent) {
+      const children = parent.childNodes || [];
+      let result = false;
+      for (let i = 0, j = children.length; i < j; i++) {
+        const child = children[i];
+        if (child === target || (deep && walk(child))) {
+          result = true;
+          break;
+        }
+      }
+      return result;
+    };
+
+    return walk(this);
+  }
+
+  remove() {
+    const parent = this.parent;
+    if (parent) {
+      parent.removeChild(this);
+    }
+  }
+
+  insertChild(child, index, batch) {
+    if (!child) throw new Error('insertChild error: child is required.');
+
+    if (!(child instanceof Node)) {
+      if (!batch) {
+        const children = this.getChildren(true);
+        if (children.indexOf(child.data) === -1) {
+          if (typeof index === 'undefined' || index < 0) {
+            children.push(child.data);
+          } else {
+            children.splice(index, 0, child.data);
+          }
+        }
+      }
+      objectAssign(child, {
+        parent: this,
+        store: this.store
+      });
+      child = new Node(child);
+    }
+
+    child.level = this.level + 1;
+
+    if (typeof index === 'undefined' || index < 0) {
+      this.childNodes.push(child);
+    } else {
+      this.childNodes.splice(index, 0, child);
+    }
+
+    this.updateLeafState();
+  }
+
+  insertBefore(child, ref) {
+    let index;
+    if (ref) {
+      index = this.childNodes.indexOf(ref);
+    }
+    this.insertChild(child, index);
+  }
+
+  insertAfter(child, ref) {
+    let index;
+    if (ref) {
+      index = this.childNodes.indexOf(ref);
+      if (index !== -1) index += 1;
+    }
+    this.insertChild(child, index);
+  }
+
+  removeChild(child) {
+    const children = this.getChildren() || [];
+    const dataIndex = children.indexOf(child.data);
+    if (dataIndex > -1) {
+      children.splice(dataIndex, 1);
+    }
+
+    const index = this.childNodes.indexOf(child);
+
+    if (index > -1) {
+      this.store && this.store.deregisterNode(child);
+      child.parent = null;
+      this.childNodes.splice(index, 1);
+    }
+
+    this.updateLeafState();
+  }
+
+  removeChildByData(data) {
+    let targetNode = null;
+
+    for (let i = 0; i < this.childNodes.length; i++) {
+      if (this.childNodes[i].data === data) {
+        targetNode = this.childNodes[i];
+        break;
+      }
+    }
+
+    if (targetNode) {
+      this.removeChild(targetNode);
+    }
+  }
+
+  expand(callback, expandParent) {
+    const done = () => {
+      if (expandParent) {
+        let parent = this.parent;
+        while (parent.level > 0) {
+          parent.expanded = true;
+          parent = parent.parent;
+        }
+      }
+      this.expanded = true;
+      if (callback) callback();
+    };
+
+    if (this.shouldLoadData()) {
+      this.loadData((data) => {
+        if (data instanceof Array) {
+          if (this.checked) {
+            this.setChecked(true, true);
+          } else if (!this.store.checkStrictly) {
+            reInitChecked(this);
+          }
+          done();
+        }
+      });
+    } else {
+      done();
+    }
+  }
+
+  doCreateChildren(array, defaultProps = {}) {
+    array.forEach((item) => {
+      this.insertChild(objectAssign({ data: item }, defaultProps), undefined, true);
+    });
+  }
+
+  collapse() {
+    this.expanded = false;
+  }
+
+  shouldLoadData() {
+    return this.store.lazy === true && this.store.load && !this.loaded;
+  }
+
+  updateLeafState() {
+    if (this.store.lazy === true && this.loaded !== true && typeof this.isLeafByUser !== 'undefined') {
+      this.isLeaf = this.isLeafByUser;
+      return;
+    }
+    const childNodes = this.childNodes;
+    if (!this.store.lazy || (this.store.lazy === true && this.loaded === true)) {
+      // this.isLeaf = !childNodes || childNodes.length === 0;
+      this.isLeaf = this.isLeafByUser;
+      return;
+    }
+    this.isLeaf = false;
+  }
+
+  setChecked(value, deep, recursion, passValue) {
+    this.indeterminate = value === 'half';
+    this.checked = value === true;
+
+    if (this.store.checkStrictly) return;
+
+    if (!(this.shouldLoadData() && !this.store.checkDescendants)) {
+      let { all, allWithoutDisable } = getChildState(this.childNodes);
+
+      if (!this.isLeaf && (!all && allWithoutDisable)) {
+        this.checked = false;
+        value = false;
+      }
+
+      const handleDescendants = () => {
+        if (deep) {
+          const childNodes = this.childNodes;
+          for (let i = 0, j = childNodes.length; i < j; i++) {
+            const child = childNodes[i];
+            passValue = passValue || value !== false;
+            const isCheck = child.disabled ? child.checked : passValue;
+            child.setChecked(isCheck, deep, true, passValue);
+          }
+          const { half, all } = getChildState(childNodes);
+          if (!all) {
+            this.checked = all;
+            this.indeterminate = half;
+          }
+        }
+      };
+
+      if (this.shouldLoadData()) {
+        // Only work on lazy load data.
+        this.loadData(() => {
+          handleDescendants();
+          reInitChecked(this);
+        }, {
+          checked: value !== false
+        });
+        return;
+      } else {
+        handleDescendants();
+      }
+    }
+
+    const parent = this.parent;
+    if (!parent || parent.level === 0) return;
+
+    if (!recursion) {
+      reInitChecked(parent);
+    }
+  }
+
+  getChildren(forceInit = false) { // this is data
+    if (this.level === 0) return this.data;
+    const data = this.data;
+    if (!data) return null;
+
+    const props = this.store.props;
+    let children = 'children';
+    if (props) {
+      children = props.children || 'children';
+    }
+
+    if (data[children] === undefined) {
+      data[children] = null;
+    }
+
+    if (forceInit && !data[children]) {
+      data[children] = [];
+    }
+
+    return data[children];
+  }
+
+  updateChildren() {
+    const newData = this.getChildren() || [];
+    const oldData = this.childNodes.map((node) => node.data);
+
+    const newDataMap = {};
+    const newNodes = [];
+
+    newData.forEach((item, index) => {
+      const key = item[NODE_KEY];
+      const isNodeExists = !!key && arrayFindIndex(oldData, data => data[NODE_KEY] === key) >= 0;
+      if (isNodeExists) {
+        newDataMap[key] = { index, data: item };
+      } else {
+        newNodes.push({ index, data: item });
+      }
+    });
+
+    if (!this.store.lazy) {
+      oldData.forEach((item) => {
+        if (!newDataMap[item[NODE_KEY]]) this.removeChildByData(item);
+      });
+    }
+
+    newNodes.forEach(({ index, data }) => {
+      this.insertChild({ data }, index);
+    });
+
+    this.updateLeafState();
+  }
+
+  loadData(callback, defaultProps = {}) {
+    if (this.store.lazy === true && this.store.load && !this.loaded && (!this.loading || Object.keys(defaultProps).length)) {
+      this.loading = true;
+
+      const resolve = (children) => {
+        this.loaded = true;
+        this.loading = false;
+        this.childNodes = [];
+
+        this.doCreateChildren(children, defaultProps);
+
+        this.updateLeafState();
+        if (callback) {
+          callback.call(this, children);
+        }
+      };
+
+      this.store.load(this, resolve);
+    } else {
+      if (callback) {
+        callback.call(this);
+      }
+    }
+  }
+}

src/components/org-tree/src/model/tree-store.js

@@ -0,0 +1,340 @@
+import Node from './node';
+import { getNodeKey } from './util';
+
+export default class TreeStore {
+  constructor(options) {
+    this.currentNode = null;
+    this.currentNodeKey = null;
+
+    for (let option in options) {
+      if (options.hasOwnProperty(option)) {
+        this[option] = options[option];
+      }
+    }
+
+    this.nodesMap = {};
+
+    this.root = new Node({
+      data: this.data,
+      store: this
+    });
+
+    if (this.lazy && this.load) {
+      const loadFn = this.load;
+      loadFn(this.root, (data) => {
+        this.root.doCreateChildren(data);
+        this._initDefaultCheckedNodes();
+      });
+    } else {
+      this._initDefaultCheckedNodes();
+    }
+  }
+
+  filter(value) {
+    const filterNodeMethod = this.filterNodeMethod;
+    const lazy = this.lazy;
+    const traverse = function(node) {
+      const childNodes = node.root ? node.root.childNodes : node.childNodes;
+
+      childNodes.forEach((child) => {
+        child.visible = filterNodeMethod.call(child, value, child.data, child);
+
+        traverse(child);
+      });
+
+      if (!node.visible && childNodes.length) {
+        let allHidden = true;
+        allHidden = !childNodes.some(child => child.visible);
+
+        if (node.root) {
+          node.root.visible = allHidden === false;
+        } else {
+          node.visible = allHidden === false;
+        }
+      }
+      if (!value) return;
+
+      if (node.visible && !node.isLeaf && !lazy) node.expand();
+    };
+
+    traverse(this);
+  }
+
+  setData(newVal) {
+    const instanceChanged = newVal !== this.root.data;
+    if (instanceChanged) {
+      this.root.setData(newVal);
+      this._initDefaultCheckedNodes();
+    } else {
+      this.root.updateChildren();
+    }
+  }
+
+  getNode(data) {
+    if (data instanceof Node) return data;
+    const key = typeof data !== 'object' ? data : getNodeKey(this.key, data);
+    return this.nodesMap[key] || null;
+  }
+
+  insertBefore(data, refData) {
+    const refNode = this.getNode(refData);
+    refNode.parent.insertBefore({ data }, refNode);
+  }
+
+  insertAfter(data, refData) {
+    const refNode = this.getNode(refData);
+    refNode.parent.insertAfter({ data }, refNode);
+  }
+
+  remove(data) {
+    const node = this.getNode(data);
+
+    if (node && node.parent) {
+      if (node === this.currentNode) {
+        this.currentNode = null;
+      }
+      node.parent.removeChild(node);
+    }
+  }
+
+  append(data, parentData) {
+    const parentNode = parentData ? this.getNode(parentData) : this.root;
+
+    if (parentNode) {
+      parentNode.insertChild({ data });
+    }
+  }
+
+  _initDefaultCheckedNodes() {
+    const defaultCheckedKeys = this.defaultCheckedKeys || [];
+    const nodesMap = this.nodesMap;
+
+    defaultCheckedKeys.forEach((checkedKey) => {
+      const node = nodesMap[checkedKey];
+
+      if (node) {
+        node.setChecked(true, !this.checkStrictly);
+      }
+    });
+  }
+
+  _initDefaultCheckedNode(node) {
+    const defaultCheckedKeys = this.defaultCheckedKeys || [];
+
+    if (defaultCheckedKeys.indexOf(node.key) !== -1) {
+      node.setChecked(true, !this.checkStrictly);
+    }
+  }
+
+  setDefaultCheckedKey(newVal) {
+    if (newVal !== this.defaultCheckedKeys) {
+      this.defaultCheckedKeys = newVal;
+      this._initDefaultCheckedNodes();
+    }
+  }
+
+  registerNode(node) {
+    const key = this.key;
+    if (!key || !node || !node.data) return;
+
+    const nodeKey = node.key;
+    if (nodeKey !== undefined) this.nodesMap[node.key] = node;
+  }
+
+  deregisterNode(node) {
+    const key = this.key;
+    if (!key || !node || !node.data) return;
+
+    node.childNodes.forEach(child => {
+      this.deregisterNode(child);
+    });
+
+    delete this.nodesMap[node.key];
+  }
+
+  getCheckedNodes(leafOnly = false, includeHalfChecked = false) {
+    const checkedNodes = [];
+    const traverse = function(node) {
+      const childNodes = node.root ? node.root.childNodes : node.childNodes;
+
+      childNodes.forEach((child) => {
+        if ((child.checked || (includeHalfChecked && child.indeterminate)) && (!leafOnly || (leafOnly && child.isLeaf))) {
+          checkedNodes.push(child.data);
+        }
+
+        traverse(child);
+      });
+    };
+
+    traverse(this);
+
+    return checkedNodes;
+  }
+
+  getCheckedKeys(leafOnly = false) {
+    return this.getCheckedNodes(leafOnly).map((data) => (data || {})[this.key]);
+  }
+
+  getHalfCheckedNodes() {
+    const nodes = [];
+    const traverse = function(node) {
+      const childNodes = node.root ? node.root.childNodes : node.childNodes;
+
+      childNodes.forEach((child) => {
+        if (child.indeterminate) {
+          nodes.push(child.data);
+        }
+
+        traverse(child);
+      });
+    };
+
+    traverse(this);
+
+    return nodes;
+  }
+
+  getHalfCheckedKeys() {
+    return this.getHalfCheckedNodes().map((data) => (data || {})[this.key]);
+  }
+
+  _getAllNodes() {
+    const allNodes = [];
+    const nodesMap = this.nodesMap;
+    for (let nodeKey in nodesMap) {
+      if (nodesMap.hasOwnProperty(nodeKey)) {
+        allNodes.push(nodesMap[nodeKey]);
+      }
+    }
+
+    return allNodes;
+  }
+
+  updateChildren(key, data) {
+    const node = this.nodesMap[key];
+    if (!node) return;
+    const childNodes = node.childNodes;
+    for (let i = childNodes.length - 1; i >= 0; i--) {
+      const child = childNodes[i];
+      this.remove(child.data);
+    }
+    for (let i = 0, j = data.length; i < j; i++) {
+      const child = data[i];
+      this.append(child, node.data);
+    }
+  }
+
+  _setCheckedKeys(key, leafOnly = false, checkedKeys) {
+    const allNodes = this._getAllNodes().sort((a, b) => b.level - a.level);
+    const cache = Object.create(null);
+    const keys = Object.keys(checkedKeys);
+    allNodes.forEach(node => node.setChecked(false, false));
+    for (let i = 0, j = allNodes.length; i < j; i++) {
+      const node = allNodes[i];
+      const nodeKey = node.data[key].toString();
+      let checked = keys.indexOf(nodeKey) > -1;
+      if (!checked) {
+        if (node.checked && !cache[nodeKey]) {
+          node.setChecked(false, false);
+        }
+        continue;
+      }
+
+      let parent = node.parent;
+      while (parent && parent.level > 0) {
+        cache[parent.data[key]] = true;
+        parent = parent.parent;
+      }
+
+      if (node.isLeaf || this.checkStrictly) {
+        node.setChecked(true, false);
+        continue;
+      }
+      node.setChecked(true, true);
+
+      if (leafOnly) {
+        node.setChecked(false, false);
+        const traverse = function(node) {
+          const childNodes = node.childNodes;
+          childNodes.forEach((child) => {
+            if (!child.isLeaf) {
+              child.setChecked(false, false);
+            }
+            traverse(child);
+          });
+        };
+        traverse(node);
+      }
+    }
+  }
+
+  setCheckedNodes(array, leafOnly = false) {
+    const key = this.key;
+    const checkedKeys = {};
+    array.forEach((item) => {
+      checkedKeys[(item || {})[key]] = true;
+    });
+
+    this._setCheckedKeys(key, leafOnly, checkedKeys);
+  }
+
+  setCheckedKeys(keys, leafOnly = false) {
+    this.defaultCheckedKeys = keys;
+    const key = this.key;
+    const checkedKeys = {};
+    keys.forEach((key) => {
+      checkedKeys[key] = true;
+    });
+
+    this._setCheckedKeys(key, leafOnly, checkedKeys);
+  }
+
+  setDefaultExpandedKeys(keys) {
+    keys = keys || [];
+    this.defaultExpandedKeys = keys;
+
+    keys.forEach((key) => {
+      const node = this.getNode(key);
+      if (node) node.expand(null, this.autoExpandParent);
+    });
+  }
+
+  setChecked(data, checked, deep) {
+    const node = this.getNode(data);
+
+    if (node) {
+      node.setChecked(!!checked, deep);
+    }
+  }
+
+  getCurrentNode() {
+    return this.currentNode;
+  }
+
+  setCurrentNode(currentNode) {
+    const prevCurrentNode = this.currentNode;
+    if (prevCurrentNode) {
+      prevCurrentNode.isCurrent = false;
+    }
+    this.currentNode = currentNode;
+    this.currentNode.isCurrent = true;
+  }
+
+  setUserCurrentNode(node) {
+    const key = node[this.key];
+    const currNode = this.nodesMap[key];
+    this.setCurrentNode(currNode);
+  }
+
+  setCurrentNodeKey(key) {
+    if (key === null || key === undefined) {
+      this.currentNode && (this.currentNode.isCurrent = false);
+      this.currentNode = null;
+      return;
+    }
+    const node = this.getNode(key);
+    if (node) {
+      this.setCurrentNode(node);
+    }
+  }
+};

src/components/org-tree/src/model/util.js

@@ -0,0 +1,27 @@
+export const NODE_KEY = '$treeNodeId';
+
+export const markNodeData = function(node, data) {
+  if (!data || data[NODE_KEY]) return;
+  Object.defineProperty(data, NODE_KEY, {
+    value: node.id,
+    enumerable: false,
+    configurable: false,
+    writable: false
+  });
+};
+
+export const getNodeKey = function(key, data) {
+  if (!key) return data[NODE_KEY];
+  return data[key];
+};
+
+export const findNearestComponent = (element, componentName) => {
+  let target = element;
+  while (target && target.tagName !== 'BODY') {
+    if (target.__vue__ && target.__vue__.$options.name === componentName) {
+      return target.__vue__;
+    }
+    target = target.parentNode;
+  }
+  return null;
+};

src/components/org-tree/src/tree-node.vue

@@ -0,0 +1,279 @@
+<template>
+  <div
+    class="el-tree-node"
+    @click.stop="handleClick"
+    @contextmenu="($event) => this.handleContextMenu($event)"
+    v-show="node.visible"
+    :class="{
+      'is-expanded': expanded,
+      'is-current': node.isCurrent,
+      'is-hidden': !node.visible,
+      'is-focusable': !node.disabled,
+      'is-checked': !node.disabled && node.checked
+    }"
+    role="treeitem"
+    tabindex="-1"
+    :aria-expanded="expanded"
+    :aria-disabled="node.disabled"
+    :aria-checked="node.checked"
+    :draggable="tree.draggable"
+    @dragstart.stop="handleDragStart"
+    @dragover.stop="handleDragOver"
+    @dragend.stop="handleDragEnd"
+    @drop.stop="handleDrop"
+    ref="node"
+  >
+    <div class="el-tree-node__content"
+      :style="{ 'padding-left': (node.level - 1) * tree.indent + 'px' }">
+      <span
+        @click.stop="handleExpandIconClick"
+        :class="[
+          { 'is-leaf': node.isLeaf, expanded: !node.isLeaf && expanded },
+          'el-tree-node__expand-icon',
+          tree.iconClass ? tree.iconClass : 'el-icon-caret-right'
+        ]"
+      >
+      </span>
+      <el-checkbox
+        v-if="showCheckbox && node.data.showCheckbox"
+        v-model="node.checked"
+        :indeterminate="node.indeterminate"
+        :disabled="!!node.disabled"
+        @click.native.stop
+        @change="handleCheckChange"
+      >
+      </el-checkbox>
+      <span
+        v-if="node.loading"
+        class="el-tree-node__loading-icon el-icon-loading">
+      </span>
+      <node-content :node="node"></node-content>
+    </div>
+    <el-collapse-transition>
+      <div
+        class="el-tree-node__children"
+        v-if="!renderAfterExpand || childNodeRendered"
+        v-show="expanded"
+        role="group"
+        :aria-expanded="expanded"
+      >
+        <el-tree-node
+          :render-content="renderContent"
+          v-for="child in node.childNodes"
+          :render-after-expand="renderAfterExpand"
+          :show-checkbox="showCheckbox"
+          :key="getNodeKey(child)"
+          :node="child"
+          @node-expand="handleChildNodeExpand">
+        </el-tree-node>
+      </div>
+    </el-collapse-transition>
+  </div>
+</template>
+
+<script type="text/jsx">
+  import ElCollapseTransition from 'element-ui/src/transitions/collapse-transition';
+  import ElCheckbox from 'element-ui/packages/checkbox';
+  import emitter from 'element-ui/src/mixins/emitter';
+  import { getNodeKey } from './model/util';
+
+  export default {
+    name: 'ElTreeNode',
+
+    componentName: 'ElTreeNode',
+
+    mixins: [emitter],
+
+    props: {
+      node: {
+        default() {
+          return {};
+        }
+      },
+      props: {},
+      renderContent: Function,
+      renderAfterExpand: {
+        type: Boolean,
+        default: true
+      },
+      showCheckbox: {
+        type: Boolean,
+        default: false
+      }
+    },
+
+    components: {
+      ElCollapseTransition,
+      ElCheckbox,
+      NodeContent: {
+        props: {
+          node: {
+            required: true
+          }
+        },
+        render(h) {
+          const parent = this.$parent;
+          const tree = parent.tree;
+          const node = this.node;
+          const { data, store } = node;
+          return (
+            parent.renderContent
+              ? parent.renderContent.call(parent._renderProxy, h, { _self: tree.$vnode.context, node, data, store })
+              : tree.$scopedSlots.default
+                ? tree.$scopedSlots.default({ node, data })
+                : <span class="el-tree-node__label">{ node.label }</span>
+          );
+        }
+      }
+    },
+
+    data() {
+      return {
+        tree: null,
+        expanded: false,
+        childNodeRendered: false,
+        oldChecked: null,
+        oldIndeterminate: null
+      };
+    },
+
+    watch: {
+      'node.indeterminate'(val) {
+        this.handleSelectChange(this.node.checked, val);
+      },
+
+      'node.checked'(val) {
+        this.handleSelectChange(val, this.node.indeterminate);
+      },
+
+      'node.expanded'(val) {
+        this.$nextTick(() => this.expanded = val);
+        if (val) {
+          this.childNodeRendered = true;
+        }
+      }
+    },
+
+    methods: {
+      getNodeKey(node) {
+        return getNodeKey(this.tree.nodeKey, node.data);
+      },
+
+      handleSelectChange(checked, indeterminate) {
+        if (this.oldChecked !== checked && this.oldIndeterminate !== indeterminate) {
+          this.tree.$emit('check-change', this.node.data, checked, indeterminate);
+        }
+        this.oldChecked = checked;
+        this.indeterminate = indeterminate;
+      },
+
+      handleClick() {
+        const store = this.tree.store;
+        store.setCurrentNode(this.node);
+        this.tree.$emit('current-change', store.currentNode ? store.currentNode.data : null, store.currentNode);
+        this.tree.currentNode = this;
+        if (this.tree.expandOnClickNode) {
+          this.handleExpandIconClick();
+        }
+        if (this.tree.checkOnClickNode && !this.node.disabled) {
+          this.handleCheckChange(null, {
+            target: { checked: !this.node.checked }
+          });
+        }
+        this.tree.$emit('node-click', this.node.data, this.node, this);
+      },
+
+      handleContextMenu(event) {
+        if (this.tree._events['node-contextmenu'] && this.tree._events['node-contextmenu'].length > 0) {
+          event.stopPropagation();
+          event.preventDefault();
+        }
+        this.tree.$emit('node-contextmenu', event, this.node.data, this.node, this);
+      },
+
+      handleExpandIconClick() {
+        if (this.node.isLeaf) return;
+        if (this.expanded) {
+          this.tree.$emit('node-collapse', this.node.data, this.node, this);
+          this.node.collapse();
+        } else {
+          this.node.expand();
+          this.$emit('node-expand', this.node.data, this.node, this);
+        }
+      },
+
+      handleCheckChange(value, ev) {
+        this.node.setChecked(ev.target.checked, !this.tree.checkStrictly);
+        this.$nextTick(() => {
+          const store = this.tree.store;
+          this.tree.$emit('check', this.node.data, {
+            checkedNodes: store.getCheckedNodes(),
+            checkedKeys: store.getCheckedKeys(),
+            halfCheckedNodes: store.getHalfCheckedNodes(),
+            halfCheckedKeys: store.getHalfCheckedKeys(),
+          });
+        });
+      },
+
+      handleChildNodeExpand(nodeData, node, instance) {
+        this.broadcast('ElTreeNode', 'tree-node-expand', node);
+        this.tree.$emit('node-expand', nodeData, node, instance);
+      },
+
+      handleDragStart(event) {
+        if (!this.tree.draggable) return;
+        this.tree.$emit('tree-node-drag-start', event, this);
+      },
+
+      handleDragOver(event) {
+        if (!this.tree.draggable) return;
+        this.tree.$emit('tree-node-drag-over', event, this);
+        event.preventDefault();
+      },
+
+      handleDrop(event) {
+        event.preventDefault();
+      },
+
+      handleDragEnd(event) {
+        if (!this.tree.draggable) return;
+        this.tree.$emit('tree-node-drag-end', event, this);
+      }
+    },
+
+    created() {
+      const parent = this.$parent;
+
+      if (parent.isTree) {
+        this.tree = parent;
+      } else {
+        this.tree = parent.tree;
+      }
+
+      const tree = this.tree;
+      if (!tree) {
+        console.warn('Can not find node\'s tree.');
+      }
+
+      const props = tree.props || {};
+      const childrenKey = props['children'] || 'children';
+
+      this.$watch(`node.data.${childrenKey}`, () => {
+        this.node.updateChildren();
+      });
+
+      if (this.node.expanded) {
+        this.expanded = true;
+        this.childNodeRendered = true;
+      }
+
+      if(this.tree.accordion) {
+        this.$on('tree-node-expand', node => {
+          if(this.node !== node) {
+            this.node.collapse();
+          }
+        });
+      }
+    }
+  };
+</script>

src/components/org-tree/src/tree.vue

@@ -0,0 +1,496 @@
+<template>
+  <div
+    class="el-tree"
+    :class="{
+      'el-tree--highlight-current': highlightCurrent,
+      'is-dragging': !!dragState.draggingNode,
+      'is-drop-not-allow': !dragState.allowDrop,
+      'is-drop-inner': dragState.dropType === 'inner'
+    }"
+    role="tree"
+  >
+    <el-tree-node
+      v-for="child in root.childNodes"
+      :node="child"
+      :props="props"
+      :render-after-expand="renderAfterExpand"
+      :show-checkbox="showCheckbox"
+      :key="getNodeKey(child)"
+      :render-content="renderContent"
+      @node-expand="handleNodeExpand">
+    </el-tree-node>
+    <div class="el-tree__empty-block" v-if="isEmpty">
+      <span class="el-tree__empty-text">{{ emptyText }}</span>
+    </div>
+    <div
+      v-show="dragState.showDropIndicator"
+      class="el-tree__drop-indicator"
+      ref="dropIndicator">
+    </div>
+  </div>
+</template>
+
+<script>
+  import TreeStore from './model/tree-store';
+  import { getNodeKey, findNearestComponent } from './model/util';
+  import ElTreeNode from './tree-node.vue';
+  import {t} from 'element-ui/src/locale';
+  import emitter from 'element-ui/src/mixins/emitter';
+  import { addClass, removeClass } from 'element-ui/src/utils/dom';
+
+  export default {
+    name: 'ElTree',
+
+    mixins: [emitter],
+
+    components: {
+      ElTreeNode
+    },
+
+    data() {
+      return {
+        store: null,
+        root: null,
+        currentNode: null,
+        treeItems: null,
+        checkboxItems: [],
+        dragState: {
+          showDropIndicator: false,
+          draggingNode: null,
+          dropNode: null,
+          allowDrop: true
+        }
+      };
+    },
+
+    props: {
+      data: {
+        type: Array
+      },
+      emptyText: {
+        type: String,
+        default() {
+          return t('el.tree.emptyText');
+        }
+      },
+      renderAfterExpand: {
+        type: Boolean,
+        default: true
+      },
+      nodeKey: String,
+      checkStrictly: Boolean,
+      defaultExpandAll: Boolean,
+      expandOnClickNode: {
+        type: Boolean,
+        default: true
+      },
+      checkOnClickNode: Boolean,
+      checkDescendants: {
+        type: Boolean,
+        default: false
+      },
+      autoExpandParent: {
+        type: Boolean,
+        default: true
+      },
+      defaultCheckedKeys: Array,
+      defaultExpandedKeys: Array,
+      currentNodeKey: [String, Number],
+      renderContent: Function,
+      showCheckbox: {
+        type: Boolean,
+        default: false
+      },
+      draggable: {
+        type: Boolean,
+        default: false
+      },
+      allowDrag: Function,
+      allowDrop: Function,
+      props: {
+        default() {
+          return {
+            children: 'children',
+            label: 'label',
+            disabled: 'disabled'
+          };
+        }
+      },
+      lazy: {
+        type: Boolean,
+        default: false
+      },
+      highlightCurrent: Boolean,
+      load: Function,
+      filterNodeMethod: Function,
+      accordion: Boolean,
+      indent: {
+        type: Number,
+        default: 18
+      },
+      iconClass: String
+    },
+
+    computed: {
+      children: {
+        set(value) {
+          this.data = value;
+        },
+        get() {
+          return this.data;
+        }
+      },
+
+      treeItemArray() {
+        return Array.prototype.slice.call(this.treeItems);
+      },
+
+      isEmpty() {
+        const { childNodes } = this.root;
+        return !childNodes || childNodes.length === 0 || childNodes.every(({visible}) => !visible);
+      }
+    },
+
+    watch: {
+      defaultCheckedKeys(newVal) {
+        this.store.setDefaultCheckedKey(newVal);
+      },
+
+      defaultExpandedKeys(newVal) {
+        this.store.defaultExpandedKeys = newVal;
+        this.store.setDefaultExpandedKeys(newVal);
+      },
+
+      data(newVal) {
+        this.store.setData(newVal);
+      },
+
+      checkboxItems(val) {
+        Array.prototype.forEach.call(val, (checkbox) => {
+          checkbox.setAttribute('tabindex', -1);
+        });
+      },
+
+      checkStrictly(newVal) {
+        this.store.checkStrictly = newVal;
+      }
+    },
+
+    methods: {
+      filter(value) {
+        if (!this.filterNodeMethod) throw new Error('[Tree] filterNodeMethod is required when filter');
+        this.store.filter(value);
+      },
+
+      getNodeKey(node) {
+        return getNodeKey(this.nodeKey, node.data);
+      },
+
+      getNodePath(data) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in getNodePath');
+        const node = this.store.getNode(data);
+        if (!node) return [];
+        const path = [node.data];
+        let parent = node.parent;
+        while (parent && parent !== this.root) {
+          path.push(parent.data);
+          parent = parent.parent;
+        }
+        return path.reverse();
+      },
+
+      getCheckedNodes(leafOnly, includeHalfChecked) {
+        return this.store.getCheckedNodes(leafOnly, includeHalfChecked);
+      },
+
+      getCheckedKeys(leafOnly) {
+        return this.store.getCheckedKeys(leafOnly);
+      },
+
+      getCurrentNode() {
+        const currentNode = this.store.getCurrentNode();
+        return currentNode ? currentNode.data : null;
+      },
+
+      getCurrentKey() {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in getCurrentKey');
+        const currentNode = this.getCurrentNode();
+        return currentNode ? currentNode[this.nodeKey] : null;
+      },
+
+      setCheckedNodes(nodes, leafOnly) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in setCheckedNodes');
+        this.store.setCheckedNodes(nodes, leafOnly);
+      },
+
+      setCheckedKeys(keys, leafOnly) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in setCheckedKeys');
+        this.store.setCheckedKeys(keys, leafOnly);
+      },
+
+      setChecked(data, checked, deep) {
+        this.store.setChecked(data, checked, deep);
+      },
+
+      getHalfCheckedNodes() {
+        return this.store.getHalfCheckedNodes();
+      },
+
+      getHalfCheckedKeys() {
+        return this.store.getHalfCheckedKeys();
+      },
+
+      setCurrentNode(node) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in setCurrentNode');
+        this.store.setUserCurrentNode(node);
+      },
+
+      setCurrentKey(key) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in setCurrentKey');
+        this.store.setCurrentNodeKey(key);
+      },
+
+      getNode(data) {
+        return this.store.getNode(data);
+      },
+
+      remove(data) {
+        this.store.remove(data);
+      },
+
+      append(data, parentNode) {
+        this.store.append(data, parentNode);
+      },
+
+      insertBefore(data, refNode) {
+        this.store.insertBefore(data, refNode);
+      },
+
+      insertAfter(data, refNode) {
+        this.store.insertAfter(data, refNode);
+      },
+
+      handleNodeExpand(nodeData, node, instance) {
+        this.broadcast('ElTreeNode', 'tree-node-expand', node);
+        this.$emit('node-expand', nodeData, node, instance);
+      },
+
+      updateKeyChildren(key, data) {
+        if (!this.nodeKey) throw new Error('[Tree] nodeKey is required in updateKeyChild');
+        this.store.updateChildren(key, data);
+      },
+
+      initTabIndex() {
+        this.treeItems = this.$el.querySelectorAll('.is-focusable[role=treeitem]');
+        this.checkboxItems = this.$el.querySelectorAll('input[type=checkbox]');
+        const checkedItem = this.$el.querySelectorAll('.is-checked[role=treeitem]');
+        if (checkedItem.length) {
+          checkedItem[0].setAttribute('tabindex', 0);
+          return;
+        }
+        this.treeItems[0] && this.treeItems[0].setAttribute('tabindex', 0);
+      },
+
+      handleKeydown(ev) {
+        const currentItem = ev.target;
+        if (currentItem.className.indexOf('el-tree-node') === -1) return;
+        const keyCode = ev.keyCode;
+        this.treeItems = this.$el.querySelectorAll('.is-focusable[role=treeitem]');
+        const currentIndex = this.treeItemArray.indexOf(currentItem);
+        let nextIndex;
+        if ([38, 40].indexOf(keyCode) > -1) { // up、down
+          ev.preventDefault();
+          if (keyCode === 38) { // up
+            nextIndex = currentIndex !== 0 ? currentIndex - 1 : 0;
+          } else {
+            nextIndex = (currentIndex < this.treeItemArray.length - 1) ? currentIndex + 1 : 0;
+          }
+          this.treeItemArray[nextIndex].focus(); // 选中
+        }
+        if ([37, 39].indexOf(keyCode) > -1) { // left、right 展开
+          ev.preventDefault();
+          currentItem.click(); // 选中
+        }
+        const hasInput = currentItem.querySelector('[type="checkbox"]');
+        if ([13, 32].indexOf(keyCode) > -1 && hasInput) { // space enter选中checkbox
+          ev.preventDefault();
+          hasInput.click();
+        }
+      }
+    },
+
+    created() {
+      this.isTree = true;
+
+      this.store = new TreeStore({
+        key: this.nodeKey,
+        data: this.data,
+        lazy: this.lazy,
+        props: this.props,
+        load: this.load,
+        currentNodeKey: this.currentNodeKey,
+        checkStrictly: this.checkStrictly,
+        checkDescendants: this.checkDescendants,
+        defaultCheckedKeys: this.defaultCheckedKeys,
+        defaultExpandedKeys: this.defaultExpandedKeys,
+        autoExpandParent: this.autoExpandParent,
+        defaultExpandAll: this.defaultExpandAll,
+        filterNodeMethod: this.filterNodeMethod
+      });
+
+      this.root = this.store.root;
+
+      let dragState = this.dragState;
+      this.$on('tree-node-drag-start', (event, treeNode) => {
+        if (typeof this.allowDrag === 'function' && !this.allowDrag(treeNode.node)) {
+          event.preventDefault();
+          return false;
+        }
+        event.dataTransfer.effectAllowed = 'move';
+
+        // wrap in try catch to address IE's error when first param is 'text/plain'
+        try {
+          // setData is required for draggable to work in FireFox
+          // the content has to be '' so dragging a node out of the tree won't open a new tab in FireFox
+          event.dataTransfer.setData('text/plain', '');
+        } catch (e) {}
+        dragState.draggingNode = treeNode;
+        this.$emit('node-drag-start', treeNode.node, event);
+      });
+
+      this.$on('tree-node-drag-over', (event, treeNode) => {
+        const dropNode = findNearestComponent(event.target, 'ElTreeNode');
+        const oldDropNode = dragState.dropNode;
+        if (oldDropNode && oldDropNode !== dropNode) {
+          removeClass(oldDropNode.$el, 'is-drop-inner');
+        }
+        const draggingNode = dragState.draggingNode;
+        if (!draggingNode || !dropNode) return;
+
+        let dropPrev = true;
+        let dropInner = true;
+        let dropNext = true;
+        let userAllowDropInner = true;
+        if (typeof this.allowDrop === 'function') {
+          dropPrev = this.allowDrop(draggingNode.node, dropNode.node, 'prev');
+          userAllowDropInner = dropInner = this.allowDrop(draggingNode.node, dropNode.node, 'inner');
+          dropNext = this.allowDrop(draggingNode.node, dropNode.node, 'next');
+        }
+        event.dataTransfer.dropEffect = dropInner ? 'move' : 'none';
+        if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) {
+          if (oldDropNode) {
+            this.$emit('node-drag-leave', draggingNode.node, oldDropNode.node, event);
+          }
+          this.$emit('node-drag-enter', draggingNode.node, dropNode.node, event);
+        }
+
+        if (dropPrev || dropInner || dropNext) {
+          dragState.dropNode = dropNode;
+        }
+
+        if (dropNode.node.nextSibling === draggingNode.node) {
+          dropNext = false;
+        }
+        if (dropNode.node.previousSibling === draggingNode.node) {
+          dropPrev = false;
+        }
+        if (dropNode.node.contains(draggingNode.node, false)) {
+          dropInner = false;
+        }
+        if (draggingNode.node === dropNode.node || draggingNode.node.contains(dropNode.node)) {
+          dropPrev = false;
+          dropInner = false;
+          dropNext = false;
+        }
+
+        const targetPosition = dropNode.$el.getBoundingClientRect();
+        const treePosition = this.$el.getBoundingClientRect();
+
+        let dropType;
+        const prevPercent = dropPrev ? (dropInner ? 0.25 : (dropNext ? 0.45 : 1)) : -1;
+        const nextPercent = dropNext ? (dropInner ? 0.75 : (dropPrev ? 0.55 : 0)) : 1;
+
+        let indicatorTop = -9999;
+        const distance = event.clientY - targetPosition.top;
+        if (distance < targetPosition.height * prevPercent) {
+          dropType = 'before';
+        } else if (distance > targetPosition.height * nextPercent) {
+          dropType = 'after';
+        } else if (dropInner) {
+          dropType = 'inner';
+        } else {
+          dropType = 'none';
+        }
+
+        const iconPosition = dropNode.$el.querySelector('.el-tree-node__expand-icon').getBoundingClientRect();
+        const dropIndicator = this.$refs.dropIndicator;
+        if (dropType === 'before') {
+          indicatorTop = iconPosition.top - treePosition.top;
+        } else if (dropType === 'after') {
+          indicatorTop = iconPosition.bottom - treePosition.top;
+        }
+        dropIndicator.style.top = indicatorTop + 'px';
+        dropIndicator.style.left = (iconPosition.right - treePosition.left) + 'px';
+
+        if (dropType === 'inner') {
+          addClass(dropNode.$el, 'is-drop-inner');
+        } else {
+          removeClass(dropNode.$el, 'is-drop-inner');
+        }
+
+        dragState.showDropIndicator = dropType === 'before' || dropType === 'after';
+        dragState.allowDrop = dragState.showDropIndicator || userAllowDropInner;
+        dragState.dropType = dropType;
+        this.$emit('node-drag-over', draggingNode.node, dropNode.node, event);
+      });
+
+      this.$on('tree-node-drag-end', (event) => {
+        const { draggingNode, dropType, dropNode } = dragState;
+        event.preventDefault();
+        event.dataTransfer.dropEffect = 'move';
+
+        if (draggingNode && dropNode) {
+          const draggingNodeCopy = { data: draggingNode.node.data };
+          if (dropType !== 'none') {
+            draggingNode.node.remove();
+          }
+          if (dropType === 'before') {
+            dropNode.node.parent.insertBefore(draggingNodeCopy, dropNode.node);
+          } else if (dropType === 'after') {
+            dropNode.node.parent.insertAfter(draggingNodeCopy, dropNode.node);
+          } else if (dropType === 'inner') {
+            dropNode.node.insertChild(draggingNodeCopy);
+          }
+          if (dropType !== 'none') {
+            this.store.registerNode(draggingNodeCopy);
+          }
+
+          removeClass(dropNode.$el, 'is-drop-inner');
+
+          this.$emit('node-drag-end', draggingNode.node, dropNode.node, dropType, event);
+          if (dropType !== 'none') {
+            this.$emit('node-drop', draggingNode.node, dropNode.node, dropType, event);
+          }
+        }
+        if (draggingNode && !dropNode) {
+          this.$emit('node-drag-end', draggingNode.node, null, dropType, event);
+        }
+
+        dragState.showDropIndicator = false;
+        dragState.draggingNode = null;
+        dragState.dropNode = null;
+        dragState.allowDrop = true;
+      });
+    },
+
+    mounted() {
+      this.initTabIndex();
+      this.$el.addEventListener('keydown', this.handleKeydown);
+    },
+
+    updated() {
+      this.treeItems = this.$el.querySelectorAll('[role=treeitem]');
+      this.checkboxItems = this.$el.querySelectorAll('input[type=checkbox]');
+    }
+  };
+</script>

src/components/student-tree/src/tree-node.vue

@@ -35,7 +35,7 @@
       >
       </span>
       <el-checkbox
-        v-if="showCheckbox && node.data.showCheckbox"
+        v-if="showCheckbox"
         v-model="node.checked"
         :indeterminate="node.indeterminate"
         :disabled="!!node.disabled"

src/pages/achievement/list/index.vue

@@ -34,6 +34,7 @@
                 <li>
                     <label>课程</label>
                     <el-select v-model="curriculumId" @change="initData">
+                        <el-option label="不限" value=""></el-option>
                         <el-option
                             v-for="item in curriculumList"
                             :key="item.cid"
@@ -172,7 +173,6 @@ export default {
             this.$get(this.api.schoolCourse).then(res => {
                 if (res.data && res.data.length) {
                     this.curriculumList = res.data;
-                    this.curriculumId = this.curriculumList[0].cid;
                     this.getData();
                 }
             }).catch(err => {

src/pages/assessment/add/index.vue

@@ -155,7 +155,7 @@
                     </div>
 
                     <div class="tree-con">
-                        <el-tree
+                        <student-tree
                             ref="tree"
                             node-key="nodeKey"
                             show-checkbox
@@ -164,11 +164,11 @@
                             lazy
                             :load="loadTree"
                             :default-checked-keys="defaultCheckedKeys"
-                            :props="{children: 'children', label: 'organizationName'}"
+                            :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
                             :filter-node-method="filterNode"
                             @check="handleCheck"
                         >
-                        </el-tree>
+                        </student-tree>
                     </div>
                 </div>
             </el-card>
@@ -193,8 +193,9 @@
 <script>
 import util from "@/libs/util";
 import { mapState, mapActions } from "vuex";
-
+import StudentTree from "@/components/student-tree/src/tree";
 export default {
+    components: { StudentTree },
     data() {
         return {
             permissionsKeys: {
@@ -347,9 +348,10 @@ export default {
                 treeList.forEach(i => {
                     if (i.level === 4) {
                         i.nodeKey = `${i.parentId}-${i.id}`;
-                        i.isLeaf = "leaf";
+                        i.leaf = true;
                     } else {
                         i.nodeKey = `${i.id}-${new Date().getTime()}`;
+                        i.leaf = false;
                     }
                     result.push(i);
                 });

src/pages/assessment/list/index.vue

@@ -44,7 +44,7 @@
             </ul>
             <div>
                 <div>
-                    <el-button v-if="auth('创建实验')" type="primary" round @click="add" >创建考核</el-button>
+                    <el-button v-if="auth('创建考核')" type="primary" round @click="add" >创建考核</el-button>
                     <el-button v-if="auth('批量删除')" type="primary" round @click="delAllData">批量删除</el-button>
                 </div>
             </div>

src/pages/course/contentSettings/index.vue

@@ -257,7 +257,7 @@ export default {
             if (this.previewing) {
                 this.closeIframe();
             } else {
-                history.back();
+                this.$router.push("/course/list");
             }
         },
         iframeOnload() {

src/pages/student/list/index.vue

@@ -63,7 +63,7 @@
                         @close="handleClose"
                     >
                         <el-form v-if="orgVisible" ref="orgForm" :model="orgForm" :rules="rules" label-width="100px">
-                            <el-form-item label="部门名称" prop="organizationName">
+                            <el-form-item :label="labelName" prop="organizationName">
                                 <el-input v-model.trim="orgForm.organizationName" placeholder="请输入"></el-input>
                             </el-form-item>
                             <el-form-item label="上级部门">
@@ -268,6 +268,7 @@ export default {
             orgLevel: "", // 架构层级 层级(1.专业 2.年级 3.班级)
             orgVisible: false, // 学生组织架对话框
             orgTitle: "", // 对话框标题
+            labelName: "部门名称", //
             isAddOrg: true, // 添加组织
             showCascader: true, // 是否显示上级部门级联组件
             orgForm: {
@@ -315,7 +316,7 @@ export default {
             },
             rules: {
                 organizationName: [
-                    { required: true, message: "请输入部门名称", trigger: "blur" }
+                    { required: true, message: "请输入名称", trigger: "blur" }
                 ],
                 account: [
                     { required: true, message: "请输入账号", trigger: "blur" },
@@ -414,11 +415,16 @@ export default {
             util.debounce(this.getOrgStudentData(), 1000);
         },
         handleAdd(node, data) { // 添加部门
-            // console.log(JSON.stringify(data));
+            console.log(JSON.stringify(data));
             this.orgVisible = true;
             this.orgTitle = "新增";
             this.isAddOrg = true;
             if (data) {
+                if (data.level === 1) {
+                    this.labelName = "年级";
+                } else if (data.level === 2) {
+                    this.labelName = "班级名称";
+                }
                 this.showCascader = false;
                 this.orgForm = {
                     organizationName: "",
@@ -427,6 +433,7 @@ export default {
                     level: data.level + 1
                 };
             } else {
+                this.labelName = "部门名称";
                 this.orgForm = {
                     organizationName: "",
                     parentId: 0,
@@ -440,6 +447,13 @@ export default {
             this.orgForm = data;
             this.orgTitle = "编辑";
             this.isAddOrg = false;
+            if (data.level === 1) {
+                this.labelName = "专业名称";
+            } else if (data.level === 2) {
+                this.labelName = "年级";
+            } else if (data.level === 3) {
+                this.labelName = "班级名称";
+            }
             if (data.ids.includes(",")) {
                 let tempArr = data.ids.split(",").map(i => Number(i));
                 tempArr.splice(tempArr.length - 1, 1);

src/pages/system/list/role.vue

@@ -25,8 +25,8 @@
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button v-if="auth('角色权限-查看')" type="text" @click="showRole(scope.row)">查看</el-button>
-                    <el-button v-if="auth('角色权限-编辑')" type="text" @click="editRole(scope.row)">编辑</el-button>
+                    <el-button v-if="auth('角色权限-编辑') && scope.row.roleName !== '超级管理员'" type="text" @click="editRole(scope.row)">编辑</el-button>
-                    <el-button v-if="auth('角色权限-删除')" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button v-if="auth('角色权限-删除') && scope.row.roleName !== '超级管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>

src/setting.js

@@ -49,6 +49,7 @@ const Setting = {
      * 基础配置
      * */
     platformId: 1, // 平台标识，1职站，2数据平台，3中台
+    platformType: 0, // 平台端区分：0->教师端 1->学生端 2->无端
     titleSuffix: title, // 网页标题的后缀
     routerMode: "hash", // 路由模式，可选值为 history 或 hash
     showProgressBar: true, // 页面切换时，是否显示模拟的进度条