Merge branch 'feat/changeKdsp' into 'master'

Feat/change kdsp

See merge request !67

app/controller/editor.ts

 import { Controller, Context } from 'egg';
-import { omitBy } from 'lodash';
+import _, { omitBy } from 'lodash';
 import { v1 as uuidv1 } from 'uuid';
 export default class EditorController extends Controller {
 
@@ -49,8 +49,11 @@ export default class EditorController extends Controller {
   // todo 编辑器获取跳过redis，但需要注意
   public async get(ctx: Context) {
     let pageInfo = await ctx.service.redis.get(`pageInfo:${ctx.params.uuid}`);
+    console.log('redis', pageInfo);
     if (!pageInfo) {
       let pageInfo = await ctx.model.PageInfo.findOne({where: { uuid: ctx.params.uuid }});
+    console.log('sql', pageInfo);
+
       if (ctx.query.lite && pageInfo) {
         // 如果存在sheme移除掉
         const page = JSON.parse(pageInfo.page || []);

app/web/config/dev.config.ts

@@ -10,7 +10,8 @@ const hostMap = {
   opapiHost: `https://opapi-test1.liangkebang.net`,
   qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
   // kdspHost: 'https://kdsp-api-test1.liangkebang.net',
-  kdspHost: 'https://talos-test1.liangkebang.net',
+  talosHost: 'https://talos-test1.liangkebang.net',
+  kdspHost: 'https://kdsp-api-test1.liangkebang.net',
   yxmTenantId: 560761,
   appIdMap: {
     560761: 'wxe16bf9293671506c',

app/web/config/prod.config.ts

@@ -7,7 +7,8 @@ const hostMap = {
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`,
   opapiHost: `${protocol}//opapi.q-gp.com`,
   qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
-  kdspHost: `${protocol}//talos.q-gp.com`,
+  talosHost: `${protocol}//talos.q-gp.com`,
+  kdspHost: `${protocol}//kdsp-api.q-gp.com`,
   yxmTenantId: 560761,
   appIdMap: {
     560761: 'wxb3e6270e1b1e0bc7',

app/web/config/test.config.ts

@@ -7,6 +7,8 @@ const hostMap = {
   qiniuHost: `${protocol}//appsync.lkbang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
   qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
+  talosHost: 'https://talos-test1.liangkebang.net',
+  kdspHost: 'https://kdsp-api-test1.liangkebang.net',
   yxmTenantId: 560761
 };
 

app/web/framework/app.ts

@@ -8,6 +8,7 @@ export default class App {
 
   bootstrap() {
     console.log('EASY_ENV_IS_NODE', EASY_ENV_IS_NODE, EASY_ENV_IS_BROWSER);
+    
     if (EASY_ENV_IS_NODE) {
       return this.server();
     }

app/web/page/editor/component/DynamicForm/component/CouponTableModal/columns/coupon.column.ts

@@ -138,7 +138,7 @@ const columns: object[] = [
     render: (h, params) => {
       const obj = receiverTypeList.find(item => item.id === params.row.receiverType) || {};
       // 处理优惠券列表显示券码的问题
-      if (params.row.receiverType == 4)  return h('div', '券码兑换');
+      if (+params.row.receiverType === 4) {  return h('div', '券码兑换'); }
       return h('div', obj.name);
     },
   },

app/web/page/editor/component/DynamicForm/component/CouponTableModal/index.ts

@@ -50,7 +50,7 @@ export default class CouponTableModal extends Vue {
     });
 
     return { data: couponInfoList.map(item => {
-      if (item.receiverType == 4) {
+      if (+item.receiverType === 4) {
         item._disabled = true;
       }
       return item;

app/web/page/editor/index.ts

@@ -12,6 +12,9 @@ const create = function(initState) {
   const store = createStore(initState);
   const router = createRouter();
   sync(store, router);
+  if (EASY_ENV_IS_BROWSER) {
+    window.QUANTUM_BLOCKS_IS_EDITTOR = true;
+  }
   return {
     router,
     store,
@@ -20,7 +23,6 @@ const create = function(initState) {
     },
   };
 };
-
 const client = function() {
   const vm = create(window.__INITIAL_STATE__);
   const app = new Vue(vm);

package-lock.json

@@ -2176,9 +2176,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.38",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.38.tgz",
-      "integrity": "sha512-3192nZfqeW5sD35+tpUZvI2CseCKTFmc2bBkwDtZ65iINekRl+HrrO7E2WeiaYQCVjbC5Hac0UaSRI42zob5LQ==",
+      "version": "0.3.39",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.39.tgz",
+      "integrity": "sha512-gPYukKwEaI/BAbIace1c0Zpw8nNtfQYy5AE1NOuYZfdwT8qZ8b4a2RZwGgaeNBL+wK5sbZy48SiKUEJPqU5grQ==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -8,7 +8,7 @@
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
-    "dev": "egg-bin dev -r egg-ts-helper/register --port 7002",
+    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=test1 npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
     "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
@@ -30,7 +30,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.38",
+    "@qg/citrus-ui": "0.3.39",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",