jufubao-base 1.0.132-beta1 → 1.0.132-beta3

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -15,6 +15,7 @@
     <!-- #endif -->
     <view class="jfb-base-fast-link__body">
       <template v-if="is_layout === 'noraml'">
+        <view class="x-line"></view>
         <view class="fast-link" :style="{ margin: outMargin}" v-if="list.length > 0">
           <view
             class="fast-link__item"
@@ -93,7 +94,8 @@
         iconColor: '#999',
         is_layout: 'noraml',
         fastName:'快速导航',
-
+        subColor:'',
+        fontSubSize:'',
 
         //边框
         is_border: 'Y',
@@ -118,11 +120,11 @@
 
     computed: {
       outMargin(){
-        let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
-        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
-        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom : 20}rpx`;
-        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 20}rpx`;
-        return margin;
+        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
+        return str
       },
       borderBox() {
         if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -131,8 +133,8 @@
 
       subNameSize(){
         return  {
-          fontSize: '32rpx',
-          color: `#333`
+          fontSize: this.fontSubSize + 'rpx',
+          color: this.subColor
         }
       }
     },
@@ -181,7 +183,8 @@
           }
         });
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
-
+        this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
+        this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
         this.listNave = this.list.map(item=>{
           const {appValue,path} = item.path
           if(appValue === undefined && path === undefined) {
@@ -202,13 +205,6 @@
         })
 
       },
-
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
     }
   }
 

package/src/components/JfbBaseFastLink/JfbBaseFastLinkLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-fast-link {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-fast-link {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseFooter/Attr.js

@@ -4,47 +4,52 @@ export default {
   advanced: [],
   content: [
     {
-      label: '', //label
-      ele: 'slot', //package 名称
+      label: '',
+      ele: 'slot',
       slot: 'is_reference_title',
+      groupKey: 'advanced',
     },
     {
-      label: '背景颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'bgColor', //form[valueKey]
-      value: '', //v-model
+      label: '背景颜色:',
+      ele: 'xd-color',
+      valueKey: 'bgColor',
+      groupKey:'style',
+      value: '',
       placeholder: '请选择背景颜色',
       setting: {
         isAlpha: false
       },
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      classNmae: 'input80',
     },
     {
-      label: '菜单文字颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'color', //form[valueKey]
-      value: '', //v-model
+      label: '菜单文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'color',
+      groupKey:'style',
+      value: '',
       setting: {
         isAlpha: false
       },
       placeholder: '请选择菜单文字颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      classNmae: 'input80',
     },
     {
-      label: '菜单文字选中颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'selectedColor', //form[valueKey]
+      label: '菜单文字选中颜色:',
+      ele: 'xd-color',
+      valueKey: 'selectedColor',
+      groupKey:'style',
       setting: {
         isAlpha: false
       },
-      value: '', //v-model
+      value: '',
       placeholder: '请选择菜单文字选中颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      classNmae: 'input80',
     },
     {
-      label: '菜单配置:', //label
-      ele: 'xd-footer-setting', //package 名称
-      valueKey: 'footer-setting', //form[valueKey]
+      label: '菜单配置:',
+      ele: 'xd-footer-setting',
+      valueKey: 'footer-setting',
+      groupKey:'advanced',
       value: [],
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
@@ -71,9 +76,10 @@ export default {
       ],
     },
     {
-      label: '', //label
-      ele: 'slot', //package 名称
+      label: '',
+      ele: 'slot',
       slot: 'is_reference',
+      groupKey: 'advanced',
     },
   ],
 };

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -42,7 +42,7 @@
     getContainerPropsValue,
     getComponentAttr
   } from "@/utils/xd.base";
-  
+
   export default {
     name: "JfbBaseFooter",
     components: {
@@ -61,22 +61,26 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value);
-        this.getNumber();
-        this.footerBarKey = this.$xdUniHelper.randomChar(20);
+      container(value,oloValue) {
+        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+        if (this.$configProject['isPreview']){
+          debugger
+          this.init(value);
+          this.getNumber();
+          this.footerBarKey = this.$xdUniHelper.randomChar(20);
+        }
       }
     },
     created() {
       this.view = this.$configProject.isPreview;
-      
+
       //生产模式 + 非预览模式
       if (this.$configProject.UNI_PLATFORM === 'h5'
         && this.$configProject.NODE_ENV === 'production'
       ){
         this.baseUrl = this.projectAttr['deploy_dir']
       }
-      
+
       //设置高度
       if(this.$configProject.isPreview) {
         this.height = getComponentAttr(this.componentAttr, 'height') - 4;
@@ -84,7 +88,7 @@
       else {
         this.height = getComponentAttr(this.componentAttr, 'height');
       }
-      
+
       this.init(this.container);
       //监听重试消息数量
       this.$xdRoot.$on('restFooterNumber', this.handle)
@@ -96,7 +100,7 @@
       onJfbLoad(options) {
         this.getNumber()
       },
-      
+
       /**
        * @description 从后台获取消息数量
        */
@@ -116,8 +120,8 @@
             })
           }
         });
-        
-        
+
+
         //预览模式
         if(this.view) {
           this.setNumber(params, params.map(item=>{
@@ -127,9 +131,9 @@
           }));
           return;
         }
-        
+
         if(status ===false) return ;
-        
+
         //打包模式
         getNoUrl(params)
           .then(res=>{
@@ -139,7 +143,7 @@
             console.log(error)
           });
       },
-      
+
       /**
        * @description 设置系统消息数量
        * @param params {Array} 请求参数
@@ -155,7 +159,7 @@
         this.init(this.container);
         this.footerBarKey = this.$xdUniHelper.randomChar(20);
       },
-      
+
       /**
        * @description 监听事件变化
        * @param value {object} 业务组件对象自己

package/src/components/JfbBaseFooter/JfbBaseFooterLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-footer {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-footer {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/