xy пре 7 година
родитељ
комит
66187587a5
26 измењених фајлова са 52 додато и 52 уклоњено
  1. 2 2
      src/app/App.jsx
  2. 1 1
      src/app/common/deploy/Deploy.jsx
  3. 0 0
      src/app/common/deploy/ali/AliConfig.jsx
  4. 0 0
      src/app/common/deploy/amazon/AmazonConfig.js
  5. 0 0
      src/app/common/deploy/huawei/HuaweiConfig.jsx
  6. 0 0
      src/app/common/deploy/index.css
  7. 2 2
      src/app/common/deploy/tencent/APIGroupCard.js
  8. 2 2
      src/app/common/deploy/tencent/APIPathCard.js
  9. 2 2
      src/app/common/deploy/tencent/DeployCard.js
  10. 0 0
      src/app/common/deploy/tencent/NotificationCard.js
  11. 1 1
      src/app/common/deploy/tencent/TencentConfig.js
  12. 0 0
      src/app/graphqlService/component/application/Application.js
  13. 0 0
      src/app/graphqlService/component/caseMetabase/CaseMetabase.jsx
  14. 0 0
      src/app/graphqlService/component/generateJs/GenerateJs.jsx
  15. 0 0
      src/app/graphqlService/component/generateJs/index.css
  16. 0 0
      src/app/graphqlService/component/graphql/Graphql.jsx
  17. 0 0
      src/app/graphqlService/component/graphql/index.css
  18. 0 0
      src/app/graphqlService/component/schema/Create.js
  19. 0 0
      src/app/graphqlService/component/schema/Schema.jsx
  20. 0 0
      src/app/graphqlService/component/schema/Table.js
  21. 0 0
      src/app/graphqlService/component/schema/index.css
  22. 6 6
      src/app/graphqlService/trialCase/TrialCase.jsx
  23. 5 5
      src/app/graphqlService/userCreate/UserCreate.jsx
  24. 1 1
      src/app/quantService/QuantService.jsx
  25. 29 29
      src/app/wechatService/wxConfig/WxConfig.jsx
  26. 1 1
      src/app/wechatService/wxTrialCase/WXTrialCase.js

+ 2 - 2
src/app/App.jsx

@@ -15,9 +15,9 @@ import UserCreate from "./graphqlService/userCreate/UserCreate";
 import WXTrialCase from "./wechatService/wxTrialCase/WXTrialCase";
 import WXUserCreate from "./wechatService/wxUserCreate/WXUserCreate";
 import Login from "../login/Login";
-import './graphqlService/common/graphql/index.css';
+import './graphqlService/component/graphql/index.css';
 import './index.css'
-import Create from "./graphqlService/common/schema/Create";
+import Create from "./graphqlService/component/schema/Create";
 import WxCreate from "./wechatService/wxCreate/WxCreate";
 
 

+ 1 - 1
src/app/graphqlService/common/deploy/Deploy.jsx → src/app/common/deploy/Deploy.jsx

@@ -6,7 +6,7 @@ import AliConfig from './ali/AliConfig';
 import AmazonConfig from './amazon/AmazonConfig';
 
 import './index.css';
-import {SHOW_FC, SEARCH_SCHEMA, SHOW_CLOUD} from "../../../../gql";
+import {SHOW_FC, SEARCH_SCHEMA, SHOW_CLOUD} from "../../../gql";
 import {request} from 'graphql-request'
 
 const tabListNoTitle = [{

+ 0 - 0
src/app/graphqlService/common/deploy/ali/AliConfig.jsx → src/app/common/deploy/ali/AliConfig.jsx


+ 0 - 0
src/app/graphqlService/common/deploy/amazon/AmazonConfig.js → src/app/common/deploy/amazon/AmazonConfig.js


+ 0 - 0
src/app/graphqlService/common/deploy/huawei/HuaweiConfig.jsx → src/app/common/deploy/huawei/HuaweiConfig.jsx


+ 0 - 0
src/app/graphqlService/common/deploy/index.css → src/app/common/deploy/index.css


+ 2 - 2
src/app/graphqlService/common/deploy/tencent/APIGroupCard.js → src/app/common/deploy/tencent/APIGroupCard.js

@@ -1,8 +1,8 @@
 import React, {Component} from 'react';
 import {Input, Collapse, Button, Radio, Icon} from 'antd';
-import {ADD_APIGROUP, UPDATE_APIGROUP} from "../../../../../gql";
+import {ADD_APIGROUP, UPDATE_APIGROUP} from "../../../../gql";
 import {request} from 'graphql-request'
-import {idGen} from "../../../../../func";
+import {idGen} from "../../../../func";
 
 const Panel = Collapse.Panel;
 

+ 2 - 2
src/app/graphqlService/common/deploy/tencent/APIPathCard.js → src/app/common/deploy/tencent/APIPathCard.js

@@ -1,8 +1,8 @@
 import React, {Component} from 'react';
 import {Input, Radio, Collapse, Button, Icon} from 'antd';
 import {request} from 'graphql-request'
-import {ADD_APIGWPATH, UPDATE_APIGWPATH} from "../../../../../gql";
-import {idGen} from "../../../../../func";
+import {ADD_APIGWPATH, UPDATE_APIGWPATH} from "../../../../gql";
+import {idGen} from "../../../../func";
 
 const Panel = Collapse.Panel;
 

+ 2 - 2
src/app/graphqlService/common/deploy/tencent/DeployCard.js → src/app/common/deploy/tencent/DeployCard.js

@@ -1,8 +1,8 @@
 import React, {Component} from 'react';
 import {Input, Radio, Collapse, Button, Icon} from 'antd';
-import {ADD_DEPLOY, UPDATE_DEPLOY} from "../../../../../gql";
+import {ADD_DEPLOY, UPDATE_DEPLOY} from "../../../../gql";
 import {request} from 'graphql-request'
-import {idGen} from "../../../../../func";
+import {idGen} from "../../../../func";
 
 const Panel = Collapse.Panel;
 

+ 0 - 0
src/app/graphqlService/common/deploy/tencent/NotificationCard.js → src/app/common/deploy/tencent/NotificationCard.js


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

@@ -5,7 +5,7 @@ import APIPathCard from './APIPathCard';
 import DeployCard from './DeployCard';
 import NotificationCard from './NotificationCard';
 
-import {SHOW_DEPLOY, SHOW_APIGWGROUP, SHOW_APIGWPATH} from "../../../../../gql";
+import {SHOW_DEPLOY, SHOW_APIGWGROUP, SHOW_APIGWPATH} from "../../../../gql";
 import {request} from 'graphql-request'
 
 class TencentConfig extends Component {

+ 0 - 0
src/app/graphqlService/common/application/Application.js → src/app/graphqlService/component/application/Application.js


+ 0 - 0
src/app/graphqlService/common/caseMetabase/CaseMetabase.jsx → src/app/graphqlService/component/caseMetabase/CaseMetabase.jsx


+ 0 - 0
src/app/graphqlService/common/generateJs/GenerateJs.jsx → src/app/graphqlService/component/generateJs/GenerateJs.jsx


+ 0 - 0
src/app/graphqlService/common/generateJs/index.css → src/app/graphqlService/component/generateJs/index.css


+ 0 - 0
src/app/graphqlService/common/graphql/Graphql.jsx → src/app/graphqlService/component/graphql/Graphql.jsx


+ 0 - 0
src/app/graphqlService/common/graphql/index.css → src/app/graphqlService/component/graphql/index.css


+ 0 - 0
src/app/graphqlService/common/schema/Create.js → src/app/graphqlService/component/schema/Create.js


+ 0 - 0
src/app/graphqlService/common/schema/Schema.jsx → src/app/graphqlService/component/schema/Schema.jsx


+ 0 - 0
src/app/graphqlService/common/schema/Table.js → src/app/graphqlService/component/schema/Table.js


+ 0 - 0
src/app/graphqlService/common/schema/index.css → src/app/graphqlService/component/schema/index.css


+ 6 - 6
src/app/graphqlService/trialCase/TrialCase.jsx

@@ -1,12 +1,12 @@
 import React, {Component} from 'react';
 import {Layout, Menu} from 'antd';
 
-import GenerateJs from "../common/generateJs/GenerateJs";
-import Deploy from '../common/deploy/Deploy';
-import Schema from '../common/schema/Schema';
-import Graphql from "../common/graphql/Graphql";
-import CaseMetabase from "../common/caseMetabase/CaseMetabase";
-import Application from "../common/application/Application";
+import GenerateJs from "../component/generateJs/GenerateJs";
+import Deploy from '../../common/deploy/Deploy';
+import Schema from '../component/schema/Schema';
+import Graphql from "../component/graphql/Graphql";
+import CaseMetabase from "../component/caseMetabase/CaseMetabase";
+import Application from "../component/application/Application";
 import axios from 'axios';
 
 axios.defaults.withCredentials = true;

+ 5 - 5
src/app/graphqlService/userCreate/UserCreate.jsx

@@ -1,11 +1,11 @@
 import React, {Component} from 'react';
 import {Layout, Menu} from 'antd';
 
-import GenerateJs from "../common/generateJs/GenerateJs";
-import Deploy from '../common/deploy/Deploy';
-import Schema from '../common/schema/Schema';
-import Graphql from "../common/graphql/Graphql";
-import CaseMetabase from "../common/caseMetabase/CaseMetabase";
+import GenerateJs from "../component/generateJs/GenerateJs";
+import Deploy from '../../common/deploy/Deploy';
+import Schema from '../component/schema/Schema';
+import Graphql from "../component/graphql/Graphql";
+import CaseMetabase from "../component/caseMetabase/CaseMetabase";
 import axios from 'axios';
 
 axios.defaults.withCredentials = true;

+ 1 - 1
src/app/quantService/QuantService.jsx

@@ -3,7 +3,7 @@ import React, {Component} from 'react';
 import {Layout, Menu} from 'antd';
 
 import QuantConfig from "./quantConfig/QuantConfig";
-import Deploy from "../graphqlService/common/deploy/Deploy";
+import Deploy from "../common/deploy/Deploy";
 import QuantResult from "./quantResult/QuantResult";
 
 const { Content } = Layout;

+ 29 - 29
src/app/wechatService/wxConfig/WxConfig.jsx

@@ -39,19 +39,17 @@ class WxConfig extends Component {
                         let {history, location, defaultConfigID, defaultAppName, trialcase} = this.props;
                         let {appName, configID, configs} = this.state;
                         return (
-                            <div>
-                                <Display
-                                    configs={configs}
-                                    configID={configID}
-                                    appName={appName}
-                                    location={location}
-                                    history={history}
-                                    defaultConfigID={defaultConfigID}
-                                    defaultAppName={defaultAppName}
-                                    trialcase={trialcase}
-                                    data={data.wxConfig_by_id}
-                                />
-                            </div>
+                            <Display
+                                configs={configs}
+                                configID={configID}
+                                appName={appName}
+                                location={location}
+                                history={history}
+                                defaultConfigID={defaultConfigID}
+                                defaultAppName={defaultAppName}
+                                trialcase={trialcase}
+                                data={data.wxConfig_by_id}
+                            />
                         )
                     }
                 }
@@ -68,17 +66,17 @@ class Display extends Component {
         this.state = {
             configID: props.configID,
             appName: props.appName,
-            mch_id: props.data === null? '' : props.data.mch_id,
-            notify_url: props.data === null? '' : props.data.notify_url,
-            appSecret: props.data === null? '' : props.data.appSecret,
-            appID: props.data === null? '' : props.data.appID,
-            token: props.data === null? '' : props.data.token,
-            spbill_create_ip: props.data === null? '' : props.data.spbill_create_ip,
-            enter_url: props.data === null? '' : props.data.enter_url,
-            pay_api_key: props.data === null? '' : props.data.pay_api_key,
-            body: props.data === null? '' : props.data.body,
-            welcome_words: props.data === null? '' : props.data.welcome_words,
-            attach: props.data === null? '' : props.data.attach,
+            mch_id: props.data === null ? '' : props.data.mch_id,
+            notify_url: props.data === null ? '' : props.data.notify_url,
+            appSecret: props.data === null ? '' : props.data.appSecret,
+            appID: props.data === null ? '' : props.data.appID,
+            token: props.data === null ? '' : props.data.token,
+            spbill_create_ip: props.data === null ? '' : props.data.spbill_create_ip,
+            enter_url: props.data === null ? '' : props.data.enter_url,
+            pay_api_key: props.data === null ? '' : props.data.pay_api_key,
+            body: props.data === null ? '' : props.data.body,
+            welcome_words: props.data === null ? '' : props.data.welcome_words,
+            attach: props.data === null ? '' : props.data.attach,
         }
     }
 
@@ -100,12 +98,13 @@ class Display extends Component {
                     configs.map(config => (
                         <div key={config} style={{marginBottom: 10}}>
                             <span className='vice-title'>{config}: </span>
-                            <Input value={this.state[config]} style={{width: 200}} onChange={this.switchConfig(config)}/>
+                            <Input value={this.state[config]} style={{width: 200}}
+                                   onChange={this.switchConfig(config)}/>
                         </div>
                     ))
                 }
                 {
-                    this.props.trialcase?
+                    this.props.trialcase ?
                         <Button type={'primary'}> need copy</Button>
                         :
                         <div>
@@ -141,6 +140,7 @@ class UpdateWXConfigButton extends Component {
         super(props);
         this.state = {}
     }
+
     render() {
         return (
             <Mutation mutation={gql(UPDATE_WXCONFIG)}>
@@ -151,7 +151,7 @@ class UpdateWXConfigButton extends Component {
                         return 'error';
                     let {id, appName, mch_id, notify_url, appSecret, appID, token, spbill_create_ip, enter_url, pay_api_key, body, welcome_words, attach} = this.props;
                     return (
-                        <Button type={'primary'} onClick={()=>{
+                        <Button type={'primary'} onClick={() => {
                             update_wxConfig({
                                 variables: {
                                     id,
@@ -167,7 +167,7 @@ class UpdateWXConfigButton extends Component {
                                     body,
                                     welcome_words,
                                     attach,
-                                    updateAt: new Date().getTime()
+                                    updatedAt: new Date().getTime()
                                 }
                             });
                         }}>save</Button>
@@ -215,7 +215,7 @@ class DeleteWXConfigButton extends Component {
                         return 'error';
                     let {id} = this.props;
                     return (
-                        <Button type={'danger'} onClick={()=>{
+                        <Button type={'danger'} onClick={() => {
                             this.showConfirm(delete_wxConfig, id);
                         }}>delete</Button>
                     )

+ 1 - 1
src/app/wechatService/wxTrialCase/WXTrialCase.js

@@ -5,7 +5,7 @@ import {Layout, Menu} from 'antd';
 import WxConfig from "../wxConfig/WxConfig";
 import WxDeploy from "../wxDeploy/WxDeploy";
 import WxResult from '../wxResult/WxResult';
-import Schema from "../../graphqlService/common/schema/Schema";
+import Schema from "../../graphqlService/component/schema/Schema";
 
 const {Content} = Layout;