Merge branch 'master' into positec

king

2022-12-09 ea471bc4b911b8f8ee4177a9eaafe900935451bf

 src/menu/components/card/cardcomponent/index.jsx

@@ -320,7 +320,7 @@
              <div className="mk-popover-control">
                <PlusOutlined className="plus" title="添加元素" onClick={this.addElement} />
                <PlusSquareOutlined className="plus" title="添加按钮" onClick={this.addButton} />
                <NormalForm title="卡片设置" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
                <NormalForm title="卡片设置" width={950} update={this.updateSetting} getForms={this.getSettingForms}>
                  <EditOutlined className="edit" title="编辑"/>
                </NormalForm>
                <CopyComponent type="cardcell" card={card}/>