Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/templates/menuconfig/editfirstmenu/index.jsx

@@ -363,6 +363,7 @@
            dict={dict}
            type="add"
            menu={null}
            inputSubmit={this.addMemuSubmit}
            wrappedComponentRef={(inst) => this.addMenuFormRef = inst}
          />
        </Modal>
@@ -392,6 +393,7 @@
            dict={dict}
            type="edit"
            menu={this.state.editMenu}
            inputSubmit={this.editMemuSubmit}
            wrappedComponentRef={(inst) => this.editMenuFormRef = inst}
          />
        </Modal>