Merge branch 'master' into positec

king

2023-10-26 742f7d11557526038d332e60a8c8ca18177bc4e4

 src/mob/components/menubar/normal-menubar/menucomponent/index.jsx

@@ -118,7 +118,7 @@
      <Col span={card.setting.width || 6}>
        <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
          <div className="mk-popover-control">
            <NormalForm title="菜单编辑" width={900} update={this.updateSetting} getForms={this.getSettingForms}>
            <NormalForm title="菜单编辑" width={950} update={this.updateSetting} getForms={this.getSettingForms}>
              <EditOutlined style={{color: '#1890ff'}} title="编辑"/>
            </NormalForm>
            <CopyComponent type="menucell" card={card}/>