Merge branch 'develop'

king

2024-07-11 ce37d8236f91da0f5ac1c6a398e94396575e7b5b

Merge branch 'develop'

 src/menu/menushell/index.jsx

@@ -141,7 +141,6 @@
        config: item.config,
        width: item.width || 24,
        name: name,
        floor: 1,   // 组件的层级
        isNew: true // 新添加标志，用于初始化
      }
      

 src/mob/mobshell/index.jsx

@@ -183,7 +183,6 @@
        config: item.config,
        width: item.width || 24,
        name: name,
        floor: 1,   // 组件的层级
        isNew: true // 新添加标志，用于初始化
      }
      

 src/pc/menushell/index.jsx

@@ -153,7 +153,6 @@
        config: item.config,
        width: item.width || 24,
        name: name,
        floor: 1,   // 组件的层级
        isNew: true // 新添加标志，用于初始化
      }
      

 src/views/mobdesign/index.jsx

@@ -2181,7 +2181,7 @@
              <Quotecomponent config={config} updateConfig={this.updateConfig}/>
              <StyleCombControlButton menu={config} />
              <Button className="mk-border-green set-home" disabled={MenuId === appHomeId} onClick={this.setHomeView}><HomeOutlined /> 设为首页</Button>
              <Button className="mk-border-purple set-login" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 设为登录页</Button>
              <Button className="mk-border-purple" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 设为登录页</Button>
              <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
              <Transfer MenuID={MenuId} />
              {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}

 src/views/mobdesign/index.scss

@@ -323,7 +323,7 @@
    }
  }
  .menu-control {
    .quote-wrap, .set-home, .set-login {
    .quote-wrap, .set-home {
      display: none!important;
    }
  }