xy vor 7 Jahren
Ursprung
Commit
f4f04f1729

+ 24 - 10
src/app/App.jsx

@@ -21,7 +21,7 @@ import Create from "./graphqlService/component/schema/Create";
 import WxCreate from "./wechatService/wxCreate/WxCreate";
 
 
-import {SHOW_ALL_SCHEMA, SHOW_CASE_SCHEMA,SHOW_PROJECT,CASE_AND_PROJECT} from "../gql";
+import {SHOW_ALL_SCHEMA, SHOW_CASE_SCHEMA, SHOW_PROJECT, CASE_AND_PROJECT} from "../gql";
 import axios from 'axios';
 import {getCookie, setCookie} from "../cookie";
 
@@ -359,15 +359,27 @@ class GraphqlSidebar extends Component {
 
     render() {
         return (
-            <Query query={gql(CASE_AND_PROJECT)} variables={{projectType:'graphql',user_id: this.state.userID}}>
+            <Query query={gql(CASE_AND_PROJECT)} variables={{projectType: 'graphql', user_id: this.state.userID}}>
                 {
                     ({loading, error, data}) => {
                         if (loading) return <Spin style={{marginLeft: 3}}/>;
                         if (error) return 'error!';
                         // console.log('CASE_SCHEMA_AND_PROJECT data', data);
-                        localStorage.setItem('ecommerce', data.caseProject.find(project => project.schema_id.schemaName === 'ecommerce').schema_id.schemaData);
-                        localStorage.setItem('subscribe', data.caseProject.find(project => project.schema_id.schemaName === 'subscribe').schema_id.schemaData);
-                        localStorage.setItem('bills', data.caseProject.find(project => project.schema_id.schemaName === 'bills').schema_id.schemaData);
+                        data.caseProject.forEach((project) => {
+                            switch (project.schema_id.schemaName) {
+                                case 'ecommerce' :
+                                    localStorage.setItem('ecommerce', project.schema_id.schemaData);
+                                    break;
+                                case 'subscribe':
+                                    localStorage.setItem('subscribe', project.schema_id.schemaData);
+                                    break;
+                                case 'bills':
+                                    localStorage.setItem('bills', project.schema_id.schemaData);
+                                    break;
+                                default:
+                                    break;
+                            }
+                        });
                         return (
                             <Menu
                                 theme="dark"
@@ -389,7 +401,8 @@ class GraphqlSidebar extends Component {
                             >
                                 <SubMenu
                                     key="trial-case"
-                                    title={<span><Icon type="appstore" theme="twoTone"/><span><FormattedMessage id="Case Show"/></span></span>}>
+                                    title={<span><Icon type="appstore" theme="twoTone"/><span><FormattedMessage
+                                        id="Case Show"/></span></span>}>
                                     {
                                         data.caseProject.map((project) =>
                                             <Menu.Item key={project.schema_id.schemaName}>
@@ -418,7 +431,8 @@ class GraphqlSidebar extends Component {
 
                                 <SubMenu
                                     key="my-create"
-                                    title={<span><Icon type="user" theme="outlined"/><span><FormattedMessage id="My Create"/></span></span>}>
+                                    title={<span><Icon type="user" theme="outlined"/><span><FormattedMessage
+                                        id="My Create"/></span></span>}>
                                     {
                                         data.project.map((project) =>
                                             <Menu.Item key={project.projectName}>
@@ -461,7 +475,7 @@ class WxConfigSiderbar extends Component {
 
     render() {
         return (
-            <Query query={gql(CASE_AND_PROJECT)} variables={{projectType:'wx',user_id: this.state.userID}}>
+            <Query query={gql(CASE_AND_PROJECT)} variables={{projectType: 'wx', user_id: this.state.userID}}>
                 {
                     ({loading, error, data}) => {
                         console.log('CASE_WXCONFIG_AND_PROJECT data', data);
@@ -491,7 +505,7 @@ class WxConfigSiderbar extends Component {
                                 </span>}>
                                     {
                                         data.caseProject.map((project) => {
-                                            if(project){
+                                            if (project) {
                                                 let appName = project.wxConfig_id.appName;
                                                 let configID = project.wxConfig_id.id;
                                                 let projectID = project.id;
@@ -529,7 +543,7 @@ class WxConfigSiderbar extends Component {
                                 </span>}>
                                     {
                                         data.project.map((project) => {
-                                            if(project){
+                                            if (project) {
                                                 let appName = project.wxConfig_id.appName;
                                                 let configID = project.wxConfig_id.id;
                                                 let projectID = project.id;

+ 3 - 1
src/app/common/deploy/tencent/NotificationCard.js

@@ -5,6 +5,8 @@ import {manageUsers} from "../../../../config";
 
 class NotificationCard extends Component {
 
+
+
     render() {
         return (
             <div>
@@ -27,7 +29,7 @@ class NotificationCard extends Component {
                                     <Icon type="question-circle"/>
                                 </Tooltip>
                             </span>
-                            <Input style={{width: 300}}/></p>
+                            <Input style={{width: 300}} value={this.props.defaultValue}/></p>
                     </div>
                 </div>
 

+ 1 - 0
src/app/common/deploy/tencent/TencentConfig.js

@@ -189,6 +189,7 @@ class TencentConfig extends Component {
                                                         <Card title={msg}>
                                                             <NotificationCard
                                                                 userID={this.props.userID}
+                                                                defalutName={defaultName}
                                                                 trialcase={this.props.trialcase}
                                                             />
                                                         </Card>

+ 2 - 3
src/app/graphqlService/component/graphql/Graphql.jsx

@@ -12,14 +12,14 @@ class Graphql extends Component {
         super(props);
         this.state = {
             api: props.api,
-            show: false
+            show: props.api !== ''
         };
     };
 
     componentWillReceiveProps(next) {
         this.setState({
             api: next.api,
-            show: false
+            show: next.api !== ''
         })
     }
 
@@ -44,7 +44,6 @@ class Graphql extends Component {
                         if (error) {
                             return 'error!';
                         }
-                        console.log(data);
                         let group = data.project_by_id.apiGWGroup_id;
                         if (this.state.api === '') {
                             this.setState({