Merge branch 'feat/1.2.2-pre' into 'master'

Feat/1.2.2 pre

See merge request !21

.gitignore

@@ -18,6 +18,7 @@ config/plugin.local.js
 config/plugin.js
 config/config.*.js
 config/apollo.json
+config/apollo.ssr.json
 index.js
 config/manifest.json
 app/view/*

app/web/.sentryclirc.ts

 module.exports = {
   // Sentry options are required
   organization: 'sentry',
-  project: 'quantum-blocks-h5',
+  project: 'quantum-block-h5',
   apiKey: '2e7e0678d81d4542b09cdbc35812f1cbb07a4993cd13435ba49d9511be11ec95',
 
    // Release version name/hash is required
-  release: 'quantum-blocks-h5@0.0.1',
+  release: 'quantum-block-h5@0.0.1',
   baseSentryURL: 'https://sentry.quantgroups.com/api/0',
   deleteAfterCompile: true,
   include: /js\//, // 只上传js和map文件

app/web/config/prod.config.ts

 const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
-const hostMap = {
-  apiHost: `${protocol}//quantum-blocks.q-gp.com`,
+export default {
+  apiHost: `https://quantum-blocks.q-gp.com`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`,
+  // opapiHost: `${protocol}//opapi.q-gp.com`,
   test: false
 };
-
-export default hostMap;

app/web/framework/app.ts

@@ -75,7 +75,7 @@ export default class App {
       return new Promise((resolve, reject) => {
         router.onReady(() => {
           this.fetch(vm).then(() => {
-            context.state = {...store.state, apollo: context.state.apollo};
+            context.state = {...store.state, apollo: context.state.apollo || {}};
             return resolve(new Vue(vm));
           });
         });

app/web/page/activity/view/activity/index.ts

@@ -100,9 +100,6 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
           gridItemEle.classList.remove('del_transform');
         }
         const transform = getStyle(gridItemEle, 'transform');
-        const transformY = transform.split('(')[1].split(')')[0].split(',')[5];
-        gridItemEle.style.top = `${transformY}px`;
-        gridItemEle.className += ' del_transform';
         if (transform && transform.length) {
           const transformY = transform.split('(')[1].split(')')[0].split(',')[5];
           gridItemEle.style.top = `${transformY}px`;

app/web/page/activity/view/activity/index.vue

@@ -32,11 +32,11 @@
 </template>
 <script lang="ts" src="./index.ts"></script>
 <style lang="less" scoped>
-	.activity {
-	  width: 100%;
-	  min-height: 100%;
+  .activity {
+    width: 100%;
+    min-height: 100%;
     background-color: rgb(244, 244, 244);
-    box-shadow: 2px 0px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 2px 0 10px rgba(0, 0, 0, 0.2);
     // overflow-x: hidden;
     // overflow-y: scroll;
     /deep/ .vue-grid-layout {
@@ -44,19 +44,22 @@
       box-sizing: content-box;
       // transform: translateY(-10px);
       transition-property: none;
+
       .vue-grid-item {
         transition-property: none;
         display: flex;
         justify-content: center;
         align-items: center;
+
         /* 不可设置溢出隐藏，tabs导航会出问题 */
         overflow: hidden;
-        &>*:first-child {
+
+        & > *:first-child {
           height: 100%;
         }
       }
     }
-	}
+  }
 
   .del_transform {
     overflow: visible !important;

app/web/page/mixins/transformStyle.mixin.ts

@@ -37,7 +37,7 @@ export default class TransformStyleMixin extends Vue {
     const eleId = element.getAttribute('id');
     const component = this.pageData.elements.find(v => v.id === eleId);
     if (!component) { return; }
-    const point = { ...component.point, h: +height };
+    const point = { ...component.point, h: Math.ceil(+height) };
     this.setElementPoint({ id: eleId, data: point });
     console.log('adjustHeight', height, component, element.getAttribute('id'), point);
 

app/web/page/store/modules/activity/index.ts

@@ -21,10 +21,7 @@ export default class EditorModule implements Module<EditorState, RootState> {
   actions: ActionTree<EditorState, RootState> = {
     async getPageDate({ commit }, condition) {
       const [res] = await api.getPageById(condition);
-      let { page, ...rest } = res as PageInfo;
-      if (!page) {
-        page = '[]';
-      }
+      const { page, ...rest } = res as PageInfo;
       commit(SET_PAGE_INFO, { ...rest, page: JSON.parse(page as string) });
     }
   };
@@ -34,8 +31,8 @@ export default class EditorModule implements Module<EditorState, RootState> {
       state.pageInfo = data;
     },
     [UPDATE_PAGE_INFO](state, { containerIndex, childIndex, data }) {
-      const page = (state.pageInfo.page as Page).elements || [];
-      if ((childIndex || childIndex === 0) && page[containerIndex].child) {
+      const page = (state.pageInfo.page as Page).elements;
+      if (childIndex || childIndex === 0) {
         page[containerIndex].child.splice(childIndex, 1, data);
       } else {
         page.splice(containerIndex, 1, data);

config/apollo.json

@@ -4,20 +4,22 @@
     "h5Host": "https://quantum-h5-test1.liangkebang.net",
     "opapiHost": "https://opapi-test1.liangkebang.net",
     "passportHost": "https://passportapi-test1.liangkebang.net",
-    "kdspHost": "https://talos-test1.liangkebang.net"
+    "kdspHost": "https://talos-test1.liangkebang.net",
+    "loginUrl": "",
+    "h5ShopHost": "https://tenet-test1.liangkebang.net/#"
   },
   "mysql": {
     "low_code": {
-      "host": "172.17.5.9",
-      "port": 31024,
+      "host": "undefined",
+      "port": "undefined",
       "username": "qa",
       "password": "qatest",
       "database": "low_code"
     }
   },
   "redis": {
-    "port": 31400,  
-    "host": "172.17.5.17",
+    "port": "undefined",
+    "host": "undefined",
     "password": "",
     "db": 0
   },

config/config.local.ts

@@ -29,8 +29,8 @@ export default (appInfo: EggAppConfig) => {
 
   exports.redis = {
     client: {
-      port: 31565,          // Redis port
-      host: '172.17.5.13',   // Redis host
+      port: 31400,          // Redis port
+      host: '172.17.5.17',   // Redis host
       password: '',
       db: 0
     }

config/config.prod.ts

@@ -20,7 +20,7 @@ export default (appInfo: EggAppConfig) => {
       password: 'ln4^ESq80j4nrTMZ',
       db: 0
     }
-  };;
+  };
 
-  return exports;
+  return {...exports, apollo: {}};
 };

package-lock.json

@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.13",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.13.tgz",
-      "integrity": "sha512-hsiOo61SwlAhp1Cc0gmOhBCH4S7aESrftZAWqWp0HbL6qwcNTLqfIOUxiFJEw0m5nrU+Evjaa8H7iAsDOBkvLg==",
+      "version": "0.1.14",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.14.tgz",
+      "integrity": "sha512-88AJuAsBMugnMFkGA60S1quAH7UEh6iNjTqvq/hbQjV5UUSxksdAgdcF0+7ASSPb8aqek4XV2fdRrvC+YBtQxA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.20",

package.json

@@ -10,7 +10,7 @@
     "dev": "egg-bin dev -r egg-ts-helper/register",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
-    "build": "cross-env COS_ENV=production easy build --devtool",
+    "build": "npm run apollo && cross-env COS_ENV=production easy build --devtool",
     "build:test": "cross-env COS_ENV=test easy build --devtool",
     "tsc": "ets && tsc -p tsconfig.json",
     "clean": "ets clean",
@@ -24,7 +24,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.20",
-    "@qg/citrus-ui": "0.1.13",
+    "@qg/citrus-ui": "0.1.14",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",