Merge branch 'develop'

king

2023-03-02 f67d89b8a0fb142625103de256f587d552d27411

 src/views/mobdesign/index.jsx

@@ -842,16 +842,15 @@
          }
        }
      } else {
        let uuids = {} // 重置公共数据源
        let commonId = Utils.getuuid()
        if (config.interfaces && config.interfaces.length > 0) {
          config.interfaces = config.interfaces.map(inter => {
            uuids[inter.uuid] = this.getuuid()
            inter.uuid = uuids[inter.uuid]
            inter.uuid = md5(commonId + inter.uuid)
            return inter
          })
        }

        config.components = MenuUtils.resetConfig(config.components, uuids, urlParam.clearMenu)
        config.components = MenuUtils.resetConfig(config.components, commonId, urlParam.clearMenu)

        if (config.version !== 2.0) {
          config.components = this.collectTB(config.components)
@@ -1607,14 +1606,14 @@
                    }

                    resolve(result)
                  })
                  }, this.netError)
                } else {
                  resolve(res)
                }
              } else {
                resolve(res)
              }
            })
            }, this.netError)
          }
        }
      }).then(res => { // 页面保存
@@ -1652,10 +1651,23 @@
            duration: 5
          })
        }
      })
      }, this.netError)
    }, 300 + (+sessionStorage.getItem('mkDelay')))
  }

  netError = (error) => {
    this.setState({
      menuloading: false
    })
    if (!error) {
      notification.warning({
        top: 92,
        message: '保存失败，请检查网络是否正常。',
        duration: 5
      })
    }
  }

  getRoleFields = () => {
    if (sessionStorage.getItem('sysRoles')) return