2020-04-09

king

2020-04-09 2ff464f30d94235b3ad04475593b75a74a354de9

 src/components/sidemenu/editthdmenu/index.jsx

@@ -71,8 +71,7 @@
    sysMenu: false,         // 添加或编辑菜单（角色权限分配等）
    optionLibs: [],         // 自定义下拉选项库
    fstMenuId: null,        // 一级菜单Id
    fstMenuList: null,      // 一级菜单列表
    roleList: null          // 角色列表，建立黑名单
    fstMenuList: null       // 一级菜单列表
  }

  /**
@@ -146,7 +145,6 @@
        _menu.supMenuList = this.props.supMenuList
        _menu.fstMenuId = this.state.fstMenuId || ''
        _menu.fstMenuList = this.state.fstMenuList || []
        _menu.roleList = this.state.roleList || []
  
        this.setState({
          handleMVisible: true,
@@ -183,7 +181,6 @@
          _menu.supMenuList = this.props.supMenuList
          _menu.fstMenuId = this.state.fstMenuId || ''
          _menu.fstMenuList = this.state.fstMenuList || []
          _menu.roleList = this.state.roleList || []

          // 检测模板是否存在
          let _Template = this.state.sysTemplates.filter(temp => temp.type === _menu.PageParam.Template)
@@ -269,7 +266,6 @@
          isSubtable: '', // 是否为主子表
          ParentID: this.props.supMenu.MenuID,
          supMenuList: this.props.supMenuList,
          roleList: this.state.roleList || [],
          fstMenuId: this.state.fstMenuId,
          fstMenuList: this.state.fstMenuList,
          menuSort: (this.props.menulist.length + 1) * 10 // 新建菜单设置排序
@@ -443,7 +439,6 @@
    if (!editMenu.fstMenuId) {
      editMenu.fstMenuId = this.state.fstMenuId
      editMenu.fstMenuList = this.state.fstMenuList
      editMenu.roleList = this.state.roleList || []
    }

    if (useType === 'sys' && template.type === 'RolePermission') { // 独立页面
@@ -680,10 +675,10 @@
      loading: true
    })

    let menuDefer = new Promise(resolve => {
      Api.getSystemConfig(_param).then(result => {
        if (result.status) {
          this.setState({
          loading: false,
            fstMenuId: result.FstIDSeleted,
            fstMenuList: result.data.map(smenu => {
              let _smenu = {
@@ -699,44 +694,6 @@
  
              return _smenu
            })
          })
        } else {
          notification.warning({
            top: 92,
            message: result.message,
            duration: 10
          })
        }
        resolve()
      })
    })

    let roleDefer = new Promise(resolve => {
      Api.getSystemConfig({func: 'sPC_Get_RolesMenu'}).then(res => {
        if (res.status) {
          this.setState({
            roleList: res.Roles.map(role => {
              return {
                uuid: Utils.getuuid(),
                value: role.RoleID,
                text: role.RoleName
              }
            })
          })
        } else {
          notification.warning({
            top: 92,
            message: res.message,
            duration: 10
          })
        }
        resolve()
      })
    })
    
    Promise.all([menuDefer, roleDefer]).then(() => {
      this.setState({
        loading: false
      }, () => {
        let _menu = JSON.parse(JSON.stringify(this.state.editMenu))

@@ -747,7 +704,6 @@
        delete _menu.loadingFstMenuId
        _menu.fstMenuId = this.state.fstMenuId
        _menu.fstMenuList = this.state.fstMenuList
        _menu.roleList = this.state.roleList || []

        this.setState({
          type: 'edit',
@@ -759,6 +715,16 @@
          document.getElementById('root').style.overflowY = 'hidden'
        })
      })
      } else {
        this.setState({
          loading: false
        })
        notification.warning({
          top: 92,
          message: result.message,
          duration: 10
        })
      }
    })
  }