fix(bottom-tip): 调整底部计算方式

app/web/page/editor/component/OperationPanel/index.ts

@@ -27,21 +27,21 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
     return this.pageData.elements.map(v => v.point);
   }
 
-  @Watch('layout', { deep: true })
-  onLayoutChange(val) {
-    const lastGridItemPoint = val[val.length - 1];
-    if (lastGridItemPoint && lastGridItemPoint.w) {
-      this.bottomInfo = {
-        x: 0,
-        y: 0,
-        w: 375,
-        h: 60,
-        i: 'page-bottom-top'
-      };
-      if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
-      this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
-    }
-  }
+  // @Watch('layout', { deep: true })
+  // onLayoutChange(val) {
+  //   const lastGridItemPoint = val[val.length - 1];
+  //   if (lastGridItemPoint && lastGridItemPoint.w) {
+  //     this.bottomInfo = {
+  //       x: 0,
+  //       y: 0,
+  //       w: 375,
+  //       h: 60,
+  //       i: 'page-bottom-top'
+  //     };
+  //     if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
+  //     this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
+  //   }
+  // }
 
   @Emit('update:isDragIn')
   dragenter() {
@@ -87,4 +87,21 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
   toggle(val) {
     //
   }
+
+  layoutUpdatedEvent() {
+    this.$nextTick(() => {
+      const lastGridItemPoint = this.layout[this.layout.length - 1];
+      if (lastGridItemPoint && lastGridItemPoint.w) {
+        this.bottomInfo = {
+          x: 0,
+          y: 0,
+          w: 375,
+          h: 60,
+          i: 'page-bottom-top'
+        };
+        if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
+        this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
+      }
+    });
+  }
 }
\ No newline at end of file

app/web/page/editor/component/OperationPanel/index.vue

@@ -13,6 +13,7 @@
         :use-css-transforms="true"
         :style="transformStyle(pageData.commonStyle)"
         @click.native.stop="toggle(false)"
+        @layout-updated="layoutUpdatedEvent"
           >
             <grid-item @click.native.stop="handleElementClick(index, null)" v-for="(item, index) in pageData.elements"
              :x="item.point.x"

package-lock.json

@@ -1491,9 +1491,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.1-beta8",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta8.tgz",
-      "integrity": "sha512-6bSv1iTQ73IF2NG5ssQbIg/DDwa3r3kv/t6DWfp/9y/aVB1Eyj4ddVesP3+TysSKf+S5ZN4unva/M5Lj3OPuHg==",
+      "version": "2.21.1-beta9",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta9.tgz",
+      "integrity": "sha512-evaqcwGPrg/RqgHZW3pFU2QpvmIlNZMA83QdGV7U58XrkTuQ4C4wE6FgB0M7kGTZzf/IpfjOZL5ZuGfSaOlGUw==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.15-beta4",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta4.tgz",
-      "integrity": "sha512-DqLR4peJapLIOQrVjvDjRsWwve4qJ0/+IZczDNYSjr2b2XB2KRahf9vYNEDDjEiRwnbDFVQYRPlVrA/BKbn0uw==",
+      "version": "0.1.15-beta5",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta5.tgz",
+      "integrity": "sha512-IP0MI8wvs6hgpBKF0ruv8DYOJB0x5tWTISFjDGhCc4JqiPVM/wtOzNNRDFA5+nHaQrOYH+QpX4P/sRXdlWkChA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.21.1-beta5",

package.json

@@ -26,8 +26,8 @@
     "@easy-team/easywebpack-vue": "^4.0.0",
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
-    "@qg/cherry-ui": "2.21.1-beta8",
-    "@qg/citrus-ui": "0.1.15-beta4",
+    "@qg/cherry-ui": "2.21.1-beta9",
+    "@qg/citrus-ui": "0.1.15-beta5",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",