Merge branch 'master' into bms

king

2021-12-02 d87530a16ed85534432e3c60c644dc96d63f6f69

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

@@ -671,7 +671,15 @@
            maskClosable={false}
            okText={dict['model.submit']}
            onOk={this.verifySubmit}
            onCancel={() => { this.setState({ profVisible: false }) }}
            onCancel={() => {
              if (this.verifyRef.handleCancel) {
                this.verifyRef.handleCancel().then(() => {
                  this.setState({ profVisible: false })
                })
              } else {
                this.setState({ profVisible: false })
              }
            }}
            destroyOnClose
          >
            {card && !card.execMode && card.OpenType !== 'excelIn' && card.OpenType !== 'excelOut' ?