xy 7 tahun lalu
induk
melakukan
ce5a5efb0c

+ 8 - 5
src/app/common/deploy/tencent/TencentConfig.js

@@ -320,10 +320,10 @@ class TencentConfig extends Component {
                             {
                                 this.state.currentStep !== '' || this.state.deploying === 'deploying' || this.state.deploying === 'deployed'?
                                     <Steps current={this.state.deploying !== 'deploying' ? this.state.currentStep : 4} style={{marginBottom: 30}}>
-                                        <Step title={this.stepStatus(0)} description="云函数配置"/>
-                                        <Step title={this.stepStatus(1)} description="服务配置"/>
-                                        <Step title={this.stepStatus(2)} description="API 配置"/>
-                                        <Step title={this.stepStatus(3)} description="通知配置"/>
+                                        <Step onClick={()=>{this.stepByStep(0)}} title={this.stepStatus(0)} description="云函数配置"/>
+                                        <Step onClick={()=>{this.stepByStep(1)}} title={this.stepStatus(1)} description="服务配置"/>
+                                        <Step onClick={()=>{this.stepByStep(2)}} title={this.stepStatus(2)} description="API 配置"/>
+                                        <Step onClick={()=>{this.stepByStep(3)}} title={this.stepStatus(3)} description="通知配置"/>
                                     </Steps>
                                     :
                                     ''
@@ -444,7 +444,10 @@ class TencentConfig extends Component {
 
                         {
                             this.state.deploying === 'deploying' ?
-                                <Spin size="large"/>
+                                <div>
+                                    <Spin size="large"/>
+                                    <div><b>大约需要等待 30s</b></div>
+                                </div>
                                 :
                                 this.state.deploying === 'finished' ?
                                     <Progress type="circle" percent={100}/>

+ 24 - 23
src/app/common/deploy/tencent/apiGroupCard/APIGroupCardRender.js

@@ -243,29 +243,6 @@ class APIGroupCardRender extends Component {
                     </Radio.Group>
                 </div>
 
-                <div style={{marginBottom: 10}}>
-                    <span className='vice-title'>
-                        {
-                            youMustFill['environmentName'] ?
-                                <span
-                                    style={{color: 'red', display: 'inline', marginRight: 10}}>*</span>
-                                :
-                                ''
-                        }
-                        <FormattedMessage id={valueToKey['environmentName']}/>
-                        &nbsp;
-                        <Tooltip placement="top" title={toolTipTitle['environmentName']}>
-                            <Icon type="question-circle"/>
-                        </Tooltip>
-                    </span>
-                    <Radio.Group onChange={this.switchConfig('environmentName')}
-                                 defaultValue={this.state.environmentName}
-                                 buttonStyle="solid">
-                        <Radio.Button value="test"><FormattedMessage id="test"/></Radio.Button>
-                        <Radio.Button value="prepub"><FormattedMessage id="prepub"/></Radio.Button>
-                        <Radio.Button value="release"><FormattedMessage id="release"/></Radio.Button>
-                    </Radio.Group>
-                </div>
                 <div style={{marginBottom: 10}}>
                             <span className='vice-title'>
                                 {
@@ -292,6 +269,30 @@ class APIGroupCardRender extends Component {
                         <Radio.Button value="http&https">http&https</Radio.Button>
                     </Radio.Group>
                 </div>
+
+                <div style={{marginBottom: 10}}>
+                    <span className='vice-title'>
+                        {
+                            youMustFill['environmentName'] ?
+                                <span
+                                    style={{color: 'red', display: 'inline', marginRight: 10}}>*</span>
+                                :
+                                ''
+                        }
+                        <FormattedMessage id={valueToKey['environmentName']}/>
+                        &nbsp;
+                        <Tooltip placement="top" title={toolTipTitle['environmentName']}>
+                            <Icon type="question-circle"/>
+                        </Tooltip>
+                    </span>
+                    <Radio.Group onChange={this.switchConfig('environmentName')}
+                                 defaultValue={this.state.environmentName}
+                                 buttonStyle="solid">
+                        <Radio.Button value="test"><FormattedMessage id="test"/></Radio.Button>
+                        <Radio.Button value="prepub"><FormattedMessage id="prepub"/></Radio.Button>
+                        <Radio.Button value="release"><FormattedMessage id="release"/></Radio.Button>
+                    </Radio.Group>
+                </div>
                 <Collapse bordered={false}>
                     <Panel header={<FormattedMessage id="Want more options?"/>}
                            style={customPanelStyle}>

+ 1 - 1
src/app/common/deploy/tencent/notificationCard/NotificationCardRender.js

@@ -229,7 +229,7 @@ class NotificationCardFetch extends Component {
                                     <Button type="primary" onClick={() => {
                                         const id = idGen('notification');
                                         this.ok(id, this.props.userID, this.props.projectID, this.props.notification);
-                                    }}><FormattedMessage id="save"/></Button>
+                                    }}><FormattedMessage id="save1"/></Button>
                                 </div>
                     }
                 </div>

+ 1 - 0
src/language/en_US.js

@@ -91,6 +91,7 @@ const en_US = {
     "user setting":"user setting",
     "cloud setting":"cloud setting",
     "save":"save",
+    "save1":"complete",
     "cancel":"cancel",
     "modify":"modify",
     "exit":"exit",

+ 1 - 0
src/language/zh_CN.js

@@ -91,6 +91,7 @@ const zh_CN = {
     "user setting":"用户设置",
     "cloud setting":"云授权设置",
     "save":"保存",
+    "save1":"完成",
     "cancel":"取消",
     "modify":"修改",
     "exit":"退出",