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

Feat/1.2.2 pre

See merge request !21

app/web/config/prod.config.ts

@@ -2,7 +2,7 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
 const hostMap = {
   apiHost: `${protocol}//quantum-blocks.q-gp.com`,
-  h5Host: '${protocol}//quantum-h5.q-gp.com',
+  h5Host: `${protocol}//quantum-h5.q-gp.com`,
   qiniuHost: `${protocol}//appsync.lkbang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`,
   opapiHost: `${protocol}//opapi.q-gp.com`,

app/web/config/test.config.ts

@@ -2,7 +2,7 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
 const hostMap = {
   apiHost: `${protocol}//quantum-blocks-test1.liangkebang.net`,
-  h5Host: '${protocol}//quantum-h5-test1.liangkebang.net',
+  h5Host: `${protocol}//quantum-h5-test1.liangkebang.net`,
   opapiHost: '${protocol}//opapi-test1.liangkebang.net',
   qiniuHost: `${protocol}//appsync.lkbang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,

app/web/page/editor/mixins/contextMenu.mixin.ts

@@ -38,6 +38,6 @@ export default class ContextMenuMixin extends Vue {
     const component = document.getElementById(elements.id);
     const height = component ? getStyle(component, 'height') : 0;
     // console.log('adjustHeight', height);
-    this.updatePageInfo({ containerIndex: this.curEleIndex, data: { ...elements, point: { ...elements.point, h: +height || elements.point.h } } });
+    this.updatePageInfo({ containerIndex: this.curEleIndex, data: { ...elements, point: { ...elements.point, h: Math.ceil(+height || elements.point.h) } } });
   }
 }
\ No newline at end of file

package-lock.json

@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.10",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.10.tgz",
-      "integrity": "sha512-aK3zz9HBzMZDPfYbYfx5q2cq6Hm4Yj1FjsxXMJDPMPGebBOmgpeIsaEVZQjdRbpcLU9VcqVmS4ByTCE8jXO2Hw==",
+      "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",
@@ -20135,9 +20135,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.51.0",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.51.0.tgz",
-      "integrity": "sha512-ITLt9sScNCBVspSHauw/W49lEZ0vjN8LyCzSNsNaqT67vTss2lYEfOyxltX8hjrhr1l/rQwmZ2wazzEqhZ/fUg==",
+      "version": "2.51.1",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.51.1.tgz",
+      "integrity": "sha512-8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw==",
       "requires": {
         "fsevents": "~2.3.1"
       }

package.json

@@ -27,7 +27,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.20",
-    "@qg/citrus-ui": "0.1.10",
+    "@qg/citrus-ui": "0.1.14",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",