fix: apollo测试

app/controller/editor.ts

 import { Controller, Context } from 'egg';
 import { trim, omitBy } from 'lodash';
 import { v1 as uuidv1 } from 'uuid';
-
+import * as path from 'path';
 export default class EditorController extends Controller {
 
   public async login(ctx: Context) {
@@ -9,7 +9,10 @@ export default class EditorController extends Controller {
   }
 
   public async home(ctx: Context) {
-    await ctx.renderClient('editor.js', {});
+    const { api, qiniu } = await import(path.resolve('./config/apollo.json'));
+    await ctx.renderClient('editor.js', {
+      apollo: {...api, ...qiniu}
+    });
   }
 
   public async save(ctx: Context) {

app/web/config/test.config.ts

 const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
-
 export default {
   apiHost: `https://quantum-blocks-test1.liangkebang.net/`,
   h5Host: 'https://quantum-h5-test1.liangkebang.net/',

app/web/index.d.ts

@@ -3,7 +3,8 @@ declare var EASY_ENV_IS_BROWSER: boolean;
 declare var __webpack_public_path__: string;
 type PlainObject<T = any> = { [key: string]: T };
 interface Window {
-  __INITIAL_STATE__: string;
+  __INITIAL_STATE__: string | any;
   __POWERED_BY_QIANKUN__: string;
   __INJECTED_PUBLIC_PATH_BY_QIANKUN__: string;
-}
+}
\ No newline at end of file
+declare var apollo: any;
\ No newline at end of file

app/web/page/editor/index.ts

@@ -23,6 +23,9 @@ const create = function(initState) {
 
 const client = function() {
   const vm = create(window.__INITIAL_STATE__);
+  if (window.__INITIAL_STATE__.apollo) {
+    window.apollo = window.__INITIAL_STATE__.apollo;
+  }
   const app = new Vue(vm);
   const root = document.getElementById('app');
   const hydrate = (<HTMLElement>root).childNodes.length > 0;

app/web/view/layout.html

@@ -11,10 +11,11 @@
     <link rel="stylesheet" type="text/css" href="https://activitystatic.lkbang.net/swiper/4.5.1/css/swiper.min.css">
     <style>
       html {
-        font-size: 37.5Px !important;
+        font-size: 37.5px !important;
       }
 
-      html, body {
+      html,
+      body {
         line-height: 1.15 !important;
       }
     </style>

config/apollo.json

 {
   "api": {
-    "apiHost": "https://quantum-blocks-vcc2.liangkebang.net/",
-    "h5Host": "https://quantum-h5-vcc2.liangkebang.net/",
-    "opapiHost": "https://opapi-vcc2.liangkebang.net/"
+    "apiHost": "https://quantum-blocks-undefined.liangkebang.net/",
+    "h5Host": "https://quantum-h5-undefined.liangkebang.net/",
+    "opapiHost": "https://opapi-undefined.liangkebang.net/"
   },
   "mysql": {
     "low_code": {

package-lock.json

@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.2",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.2.tgz",
-      "integrity": "sha512-wh2EY618bDcrnXmQIzEoL10Pnx/JYVzbj7HZNBeLi3LU4TCmDVGTAR54YQac97pJNleIXRfaSb8x39jSmm7bJw==",
+      "version": "0.1.3-beta1",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.3-beta1.tgz",
+      "integrity": "sha512-lf87UC4XOKaloHfa9rj8xnFwTfEYDhEwOQ8K5KAslxsM7aPYPMrIZi4f5JCFvrJTi7YbQRrJq+D9QkCWl6T/Hg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.19",
@@ -20135,9 +20135,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.48.0",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.48.0.tgz",
-      "integrity": "sha512-wl9ZSSSsi5579oscSDYSzGn092tCS076YB+TQrzsGuSfYyJeep8eEWj0eaRjuC5McuMNmcnR8icBqiE/FWNB1A==",
+      "version": "2.49.0",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.49.0.tgz",
+      "integrity": "sha512-UnrCjMXICx9q0jF8L7OYs7LPk95dW0U5UYp/VANnWqfuhyr66FWi/YVlI34Oy8Tp4ZGLcaUDt4APJm80b9oPWQ==",
       "requires": {
         "fsevents": "~2.3.1"
       }

package.json

@@ -26,7 +26,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.19",
-    "@qg/citrus-ui": "0.1.2",
+    "@qg/citrus-ui": "0.1.3-beta1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",

webpack.config.js

@@ -3,7 +3,6 @@ const path = require('path');
 const SentryPlugin = require("webpack-sentry-plugin");
 const resolve = filepath => path.resolve(__dirname, filepath);
 const SentryConfig = require("./app/web/.sentryclirc.ts");
-const apollo = require('@qg/apollo-nodejs');
 let { name } = require('./package');
 name = name.replace(/-/g, '');
 
@@ -75,15 +74,6 @@ module.exports = {
       define:{
         'process.env': {
            SENTRY_ENV: JSON.stringify(process.env.SENTRY_ENV)
-        },
-        'window.apollo': async function() {
-          if (process.env.NODE_ENV === 'development') return;
-          await apollo.load({
-            appId: 'quantum-blocks',
-            configPath: path.resolve(__dirname, '../config'),
-          });
-          const cfg = require("./config/apollo.json");
-          return JSON.stringify({ ...cfg.api, ...cfg.qiniu });
         }
       }
     }