2020-01-17

king

2020-01-17 bef4f9e4fc767e8dd80b106a47545f78e75e7e41

2020-01-17

 src/templates/comtableconfig/index.jsx

@@ -1221,7 +1221,7 @@

        // 删除按钮元素
        let _delActions = _this.state.delActions
        if (element.type === 'action') {
        if (element.type === 'action' || element.type === 'tabs') {
          _delActions.push(element.card.uuid)
        }

@@ -1279,7 +1279,7 @@
   */
  submitConfig = () => {
    const { menu } = this.props
    const { originMenu } = this.state
    const { originMenu, delActions } = this.state

    let config = JSON.parse(JSON.stringify(this.state.config))

@@ -1379,6 +1379,53 @@
        })
      }

      // 有按钮或标签删除时，先进行删除操作
      // 删除成功后，保存页面配置
      new Promise(resolve => {
        if (delActions.length > 0) {
          let deffers = delActions.map(item => {
            let _param = {
              func: 'sPC_MainMenu_Del',
              MenuID: item
            }
            return new Promise(resolve => {
              Api.getSystemConfig(_param).then(response => {
                resolve(response)
              })
            })
          })
          Promise.all(deffers).then(result => {
            let error = null
            result.forEach(response => {
              if (!response.status) {
                error = response
              }
            })
  
            if (error) {
              this.setState({
                menuloading: false,
                menucloseloading: false
              })
              notification.warning({
                top: 92,
                message: error.message,
                duration: 10
              })
              resolve(false)
            } else {
              this.setState({
                delActions: []
              })
              resolve(true)
            }
          })
        } else if (delActions.length === 0) {
          resolve(true)
        }
      }).then(resp => {
        if (resp === false) return
  
      Api.getSystemConfig(param).then(response => {
        if (response.status) {
          this.setState({
@@ -1408,6 +1455,7 @@
          })
        }
      })
      })
    }, () => {
      notification.warning({
        top: 92,
@@ -1422,20 +1470,36 @@
   */
  submitAction = (btnParam, tabParam) => {
    const { config } = this.state

    new Promise(resolve => {
      // 内部请求
      if (this.state.delActions.length > 0) {
        let deffers = this.state.delActions.map(item => {
          let _param = {
            func: 'sPC_MainMenu_Del',
            MenuID: item
      let deffers = []

      if (tabParam.LText) {
        let defer = new Promise(resolve => {
          Api.getSystemConfig(tabParam).then(result => {
            resolve(result)
          })
        })
        deffers.push(defer)
          }
          return new Promise(resolve => {
            Api.getSystemConfig(_param).then(res => {
              resolve(res)

      if (btnParam.LText) {
        let defer = new Promise(resolve => {
          Api.getSystemConfig(btnParam).then(result => {
            if (result.status) {
              this.setState({ // 保存成功后清空复制列表
                copyActions: []
              })
            }
            resolve(result)
            })
          })
        })
        deffers.push(defer)
      }

      if (deffers.length === 0) {
        resolve(true)
      } else {
        Promise.all(deffers).then(result => {
          let error = false
          result.forEach(res => {
@@ -1452,49 +1516,9 @@
            })
            resolve(false)
          } else {
            this.setState({
              delActions: []
            })
            resolve(true)
          }
        })
      } else if (this.state.delActions.length === 0) {
        resolve(true)
      }
    }).then(res => {
      if (res === false) return res

      if (tabParam.LText) {
        Api.getSystemConfig(tabParam).then(result => {
          if (!result.status) {
            notification.warning({
              top: 92,
              message: result.message,
              duration: 10
            })
          }
        })
      }
      if (btnParam.LText) {
        return Api.getSystemConfig(btnParam)
      } else {
        return 'copy'
      }
    }).then(response => {
      if (response === false || response === 'copy') return response

      if (response.status) {
        this.setState({
          copyActions: []
        })
        return 'copy'
      } else {
        notification.warning({
          top: 92,
          message: response.message,
          duration: 10
        })
        return false
      }
    }).then(response => {
      if (response === false) return response

 src/templates/formtabconfig/index.jsx

@@ -1076,6 +1076,7 @@
              return true
            }
          })
          _delActions.push(element.card.uuid)
        } else if (element.type === 'search') {
          _config.groups = _config.groups.map(group => {
            group.sublist = group.sublist.filter(item => item.uuid !== element.card.uuid)
@@ -1139,6 +1140,7 @@
   */
  submitConfig = () => {
    const { menu, editAction } = this.props
    const { delActions } = this.state

    let config = JSON.parse(JSON.stringify(this.state.config))

@@ -1228,6 +1230,53 @@
        })
      }

      // 有按钮或标签删除时，先进行删除操作
      // 删除成功后，保存页面配置
      new Promise(resolve => {
        if (delActions.length > 0) {
          let deffers = delActions.map(item => {
            let _param = {
              func: 'sPC_MainMenu_Del',
              MenuID: item
            }
            return new Promise(resolve => {
              Api.getSystemConfig(_param).then(response => {
                resolve(response)
              })
            })
          })
          Promise.all(deffers).then(result => {
            let error = null
            result.forEach(response => {
              if (!response.status) {
                error = response
              }
            })
  
            if (error) {
              this.setState({
                menuloading: false,
                menucloseloading: false
              })
              notification.warning({
                top: 92,
                message: error.message,
                duration: 10
              })
              resolve(false)
            } else {
              this.setState({
                delActions: []
              })
              resolve(true)
            }
          })
        } else if (delActions.length === 0) {
          resolve(true)
        }
      }).then(resp => {
        if (resp === false) return
  
      Api.getSystemConfig(param).then(response => {
        if (response.status) {
          this.setState({
@@ -1248,6 +1297,7 @@
          })
        }
      })
      })
    }, () => {
      notification.warning({
        top: 92,
@@ -1262,19 +1312,29 @@
   */
  submitAction = (btnParam, tabParam) => {
    new Promise(resolve => {
      // 内部请求
      if (this.state.delActions.length > 0) {
        let deffers = this.state.delActions.map(item => {
          let _param = {
            func: 'sPC_MainMenu_Del',
            MenuID: item
      let deffers = []

      if (tabParam.LText) {
        let defer = new Promise(resolve => {
          Api.getSystemConfig(tabParam).then(result => {
            resolve(result)
          })
        })
        deffers.push(defer)
          }
          return new Promise(resolve => {
            Api.getSystemConfig(_param).then(res => {
              resolve(res)

      if (btnParam.LText) {
        let defer = new Promise(resolve => {
          Api.getSystemConfig(btnParam).then(result => {
            resolve(result)
            })
          })
        })
        deffers.push(defer)
      }

      if (deffers.length === 0) {
        resolve(true)
      } else {
        Promise.all(deffers).then(result => {
          let error = false
          result.forEach(res => {
@@ -1291,49 +1351,12 @@
            })
            resolve(false)
          } else {
            this.setState({
              delActions: []
            })
            resolve(true)
          }
        })
      } else if (this.state.delActions.length === 0) {
        resolve(true)
      }
    }).then(res => {
      if (res === false) return res

      if (tabParam.LText) {
        Api.getSystemConfig(tabParam).then(result => {
          if (!result.status) {
            notification.warning({
              top: 92,
              message: result.message,
              duration: 10
            })
          }
        })
      }
      if (btnParam.LText) {
        return Api.getSystemConfig(btnParam)
      } else {
        return 'true'
      }
    }).then(response => {
      if (response === false || response === 'true') return response

      if (response.status) {
        return 'true'
      } else {
        notification.warning({
          top: 92,
          message: response.message,
          duration: 10
        })
        return false
      }
    }).then(response => {
      if (response === 'true') {
      if (response) {
        notification.success({
          top: 92,
          message: '保存成功',

 src/templates/subtableconfig/index.jsx

@@ -1089,6 +1089,7 @@
   * @description 标签页保存
   */
  submitConfig = () => {
    const { delActions } = this.state
    let config = JSON.parse(JSON.stringify(this.state.config))

    this.menuformRef.handleConfirm().then(res => {
@@ -1159,6 +1160,54 @@
        })
      }

      
      // 有按钮或标签删除时，先进行删除操作
      // 删除成功后，保存页面配置
      new Promise(resolve => {
        if (delActions.length > 0) {
          let deffers = delActions.map(item => {
            let _param = {
              func: 'sPC_MainMenu_Del',
              MenuID: item
            }
            return new Promise(resolve => {
              Api.getSystemConfig(_param).then(response => {
                resolve(response)
              })
            })
          })
          Promise.all(deffers).then(result => {
            let error = null
            result.forEach(response => {
              if (!response.status) {
                error = response
              }
            })
  
            if (error) {
              this.setState({
                menuloading: false,
                menucloseloading: false
              })
              notification.warning({
                top: 92,
                message: error.message,
                duration: 10
              })
              resolve(false)
            } else {
              this.setState({
                delActions: []
              })
              resolve(true)
            }
          })
        } else if (delActions.length === 0) {
          resolve(true)
        }
      }).then(resp => {
        if (resp === false) return

      Api.getSystemConfig(param).then(response => {
        if (response.status) {
          this.setState({
@@ -1183,6 +1232,7 @@
          })
        }
      })
      })
    }, () => {
      notification.warning({
        top: 92,
@@ -1198,64 +1248,21 @@
  submitAction = (param) => {
    const { config } = this.state
    new Promise(resolve => {
      // 内部请求
      if (this.state.delActions.length > 0) {
        let deffers = this.state.delActions.map(item => {
          let _param = {
            func: 'sPC_MainMenu_Del',
            MenuID: item
          }
          return new Promise(resolve => {
            Api.getSystemConfig(_param).then(res => {
              resolve(res)
            })
          })
        })
        Promise.all(deffers).then(result => {
          let error = false
          result.forEach(res => {
            if (!res.status) {
              error = res
            }
          })

          if (error) {
      if (param.LText) {
        Api.getSystemConfig(param).then(res => {
          if (res.status) {
            resolve(true)
          } else {
            notification.warning({
              top: 92,
              message: error.message,
              message: res.message,
              duration: 10
            })
            resolve(false)
          } else {
            this.setState({
              delActions: []
            })
            resolve(param)
          }
        })
      } else if (this.state.delActions.length === 0) {
        resolve(param)
      }
    }).then(res => {
      if (res === false) return res

      if (res.LText) {
        return Api.getSystemConfig(res)
      } else {
        return 'copy'
      }
    }).then(response => {
      if (response === false || response === 'copy') return response

      if (response.status) {
        return 'copy'
      } else {
        notification.warning({
          top: 92,
          message: response.message,
          duration: 10
        })
        return false
        resolve(true)
      }
    }).then(response => {
      if (response === false) return response

 src/templates/tableshare/columnform/index.jsx

@@ -216,10 +216,7 @@
        if (!err) {
          values.id = this.props.card.id
          values.uuid = this.props.card.uuid
          resolve({
            type: 'columns',
            values
          })
          resolve(values)
        } else {
          reject(err)
        }