gxd-uni-library-editx 1.0.16 → 1.0.17-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.16",
+  "version": "1.0.17-beta2",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdConfirm/XdConfirm.vue

@@ -131,7 +131,7 @@
           confirmColorType: 'primary',
           radius: '10rpx',
           btnRadius: '',
-          
+
         }
       }
     },
@@ -237,11 +237,14 @@
       }
 
       &-content {
-        padding: unit(22, rpx) unit(30, rpx) unit(60, rpx);
+        padding: unit(22, rpx) unit(30, rpx) unit(20, rpx);
         text-align: center;
         font-size: unit(34, rpx);
         line-height: unit(52, rpx);
         color: #595656;
+        max-height: 55vh;
+        overflow-y: auto;
+        margin-bottom: unit(40, rpx);
       }
 
       &-btn {

package/src/components/XdLayout/XdLayout.vue

@@ -16,22 +16,23 @@
       ></view>
       <!--topBar-->
       <view class="xd-Layout__bar"
-        v-show="showBar"
+        v-show="showBar || isPreviewShowBar"
+        :class="{isPreviewShowBar: isPreviewShowBar}"
         :style="{
           height: navBarHeight + statusBarHeight + 'rpx',
           width: '100%',
-          backgroundColor: barBgColor,
+          backgroundColor: getBarBgColor,
           backgroundImage: getNavBackImage,
-          zIndex: (wiewType ? 1300: 1000)
+          zIndex: ((showBar || isPreviewShowBar) ? 1300: 1000)
         }
       ">
         <xd-bar
           :bar-nav-height="navBarHeight"
           :bar-status-height="statusBarHeight"
-          :title="title"
+          :title="getTitle"
           :show-back="showBack"
-          :color="barTextColor"
-          :bg-color="barBgColor"
+          :color="getBarTextColor"
+          :bg-color="getBarBgColor"
           :bg-image="navigationStyle ? bgImage: ''"
           :is-slot-top-bar="isSlotTopBar"
           :text-align="barTextAlign || tabbarData.barTextAlign "
@@ -262,7 +263,6 @@
         layoutLoading: false,
         startTime: new Date().getTime(),
 
-
         startAnimation : false, //开始动画效果
         doneAnimation: false, //完成动画效果
         defaultImage: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDM4QTUyMkNDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDM4QTUyMkRDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozMkE3N0VGRkNFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkE3N0YwMENFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PliHXlsAAAAQSURBVHjaYvj//z8DQIABAAj8Av7bok0WAAAAAElFTkSuQmCC',
@@ -306,6 +306,8 @@
 
 	      //自定义背景
         customBg: null,
+	//窗口高度
+        gWindowHeight: 0,
       }
     },
     computed: {
@@ -316,6 +318,23 @@
         'brandInfo'
       ]),
 
+      isPreviewShowBar(){
+        if(this.wiewType && this.navigationStyle && !this.showBar) return true
+      },
+      getTitle(){
+        if(this.isPreviewShowBar) return '该模块只有在预览模式显示';
+        return this.title
+      },
+      getBarBgColor(){
+        if(this.isPreviewShowBar) return 'rgba(255, 244, 191, 0.9)';
+        return this.barBgColor
+      },
+      getBarTextColor(){
+        if(this.isPreviewShowBar) return '#333';
+        return this.barTextColor
+      },
+
+
       getBodyBackImage(){
 
         //无背景返回值
@@ -348,7 +367,7 @@
         let temp = 'center top'; //默认值
         let top = this.navBarHeight + this.statusBarHeight;
         //自定义 + 显示顶部导航
-        if (this.navigationStyle && (this.showBar)) {
+        if (this.navigationStyle && (this.showBar || this.isPreviewShowBar)) {
           temp = `center -${top + this.getRpx(windowTop)}rpx`;
         }
         return temp;
@@ -360,7 +379,7 @@
         let top = this.topHeight + this.navBarHeight + this.statusBarHeight;
 
         //自定义 + 显示顶部导航
-        if(this.navigationStyle && (this.showBar || this.topHeight) ) {
+        if(this.navigationStyle && (this.showBar || this.topHeight || this.isPreviewShowBar) ) {
           temp = `center -${top + this.getRpx(windowTop)}rpx`;
         }
         return temp;
@@ -387,7 +406,7 @@
       getMinHeight(){
         if(this.initStatus) {
           let temp = uni.getSystemInfoSync();
-          let windowHeight = temp.windowHeight;
+          let windowHeight = this.gWindowHeight;
           let windowTop = temp.windowTop || 0;
 
           // #ifdef H5
@@ -468,6 +487,15 @@
       this.wiewType = this.$configProject.isPreview;
       this.systemInfoSyn = uni.getSystemInfoSync();
 
+
+      this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;
+      // #ifdef H5
+      uni.onWindowResize(()=>{
+        this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;
+      })
+      // #endif
+
+
       //定位设置
       if (this.$configProject.isPreview === false
         && this.$configProject.extras
@@ -528,19 +556,6 @@
 
 
     },
-    mounted(){
-      //this.$nextTick(()=>{
-      //   // #ifdef H5
-      //   const query = uni.createSelectorQuery().in(this);
-      //   let box = query.select('#xd-Layout');
-      //   let config = {attributes: true, childList: true, subtree: true};
-      //   this.observer = new MutationObserver(mutations => {
-      //     this.doChange()
-      //   });
-      //   this.observer.observe(box._component.$el, config)
-      //   // #endif
-      // })
-    },
 
     beforeMount() {
       if (this.safeHeight === null) this.getSafeBottom();
@@ -585,6 +600,7 @@
 
         // #ifdef H5
         if (!this.showBar) this.navBarHeight = 0;
+        if(this.isPreviewShowBar)  this.navBarHeight = 80;
         // #endif
 
         // 设置状态栏高度
@@ -772,6 +788,11 @@
       background: #fff;
       top: 0;
       right: 0;
+
+      &.isPreviewShowBar /deep/ .xd-custom-bar__fixed-content-center{
+        font-size: unit(24, rpx) !important;
+        color: #dda450!important;
+      }
     }
 
     &__body {
@@ -814,6 +835,11 @@
       .safe-area();
     }
 
+    &__view {
+      height: unit(100, rpx);
+
+    }
+
     /**动画效果**/
     &__animation {
       width: 100vw;