Merge branch 'develop'

king

2023-08-31 6a27aea6629c0e8d0e967ec0ad39d3de188713b2

 src/views/menudesign/index.jsx

@@ -95,6 +95,8 @@
    try {
      let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))

      sessionStorage.setItem('MenuType', param.MenuType || 'custom')

      this.setState({
        MenuType: param.MenuType,
        MenuId: param.MenuId || param.MenuID,
@@ -1115,8 +1117,8 @@
                <Collapse accordion defaultActiveKey="basedata" bordered={false}>
                  {/* 基本信息 */}
                  <Panel header="基本信息" key="basedata">
                    {/* 菜单信息 */}
                    {config && MenuType === 'custom' ? <MenuForm
                    {config ? <>
                      {MenuType === 'custom' ? <MenuForm
                      config={config}
                      MenuId={MenuId}
                      parentId={ParentId}
@@ -1124,22 +1126,23 @@
                      MenuNo={config.MenuNo}
                      updateConfig={this.updateConfig}
                    /> : null}
                    {config && MenuType === 'home' ? <HomeForm
                      {MenuType === 'home' ? <HomeForm
                      config={config}
                      updateConfig={this.updateConfig}
                    /> : null}
                    {config && MenuType === 'billPrint' ? <PrintMenuForm
                      {MenuType === 'billPrint' ? <PrintMenuForm
                      config={config}
                      updateConfig={this.updateConfig}
                    /> : null}
                    {config ? <UrlFieldComponent
                      <UrlFieldComponent
                      config={config}
                      updateConfig={this.updateConfig}
                    /> : null}
                      />
                    {/* 表名添加 */}
                    {config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
                    {config ? <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>菜单ID</Paragraph> : null}
                    {config ? <NormalCss config={config} updateConfig={this.updateConfig}/> : null}
                      <TableComponent config={config} updatetable={this.updateConfig}/>
                      <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>菜单ID</Paragraph>
                      <NormalCss config={config} updateConfig={this.updateConfig}/>
                    </> : null}
                  </Panel>
                  {/* 组件添加 */}
                  <Panel header="组件" key="component">