jufubao-base 1.0.132-beta1 → 1.0.132-beta3

package/src/components/JfbBaseRechargeOrder/Attr.js

@@ -9,23 +9,24 @@ export default {
   content: (data) => {
     return [
       {
-        label: '外边距:',
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
+        groupKey:'style',
         value: data['margin'] || null,
-        disabled: false,
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置外边距',
+        placeholder: '请设置外填充',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置填充距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
         value: data['backgroundColor'] || null,
+        groupKey:'style',
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
@@ -35,18 +36,23 @@ export default {
         type: 'number',
         valueKey: 'padding',
         value: data.padding || '',
+        groupKey:'style',
         placeholder: '请输入间距',
         className: 'input80',
+        inline: false,
+        notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
         label: '投影设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
         valueKey: 'is_shadow',
+        groupKey:'style',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
@@ -60,6 +66,7 @@ export default {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
+        groupKey:'style',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
@@ -68,6 +75,7 @@ export default {
         label: '投影范围:',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
+        groupKey:'style',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
         multiple: false,
@@ -88,13 +96,15 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
         value: data['is_border'] || 'N',
+        groupKey:'style',
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
@@ -107,6 +117,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
@@ -115,6 +126,7 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
@@ -124,6 +136,7 @@ export default {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -139,27 +152,24 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '其他',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
-        placeholder: '请选择订单详情路径',
-        value: data.detailPath || {},
+        label: '订单详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
+        placeholder: '请选择订单详情地址',
+        value: data.detailPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
       {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
-        value: data.payPath || {},
+        label: '去支付地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择去支付地址',
+        value: data.payPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -92,7 +92,7 @@
           </view>
         </view>
       </template>
-      
+
     </view>
   </view>
 </template>
@@ -156,9 +156,11 @@ export default {
   },
   computed: {
     outMargin() {
-      return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${
-        this.margin.bottom || 20
-      }rpx ${this.margin.left || 20}rpx`;
+      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
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -280,18 +282,18 @@ export default {
         url: `${this.detailPath}?id=${item.order_id}`,
       });
     },
-   
+
     onJfbReachBottom(options) {
       if (this.hasNext) {
         this.page_token = this.next_page_token;
         this.getList();
       }
     },
-    
+
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack()
     },
-    
+
   },
 };
 </script>
@@ -304,6 +306,9 @@ export default {
     color: #333;
     &-order {
       padding: unit(32, rpx);
+      &:last-child {
+        margin-bottom: 0!important;
+      }
 
       &-header {
         font-size: unit(28, rpx);

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrderLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-recharge-order {
-  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-recharge-order {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetailLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-recharge-order-detail {
-  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-recharge-order-detail {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseRechargeSuccess/Attr.js

@@ -8,21 +8,23 @@ export default {
   content: (data) => {
     return [
       {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
+        label: '充值成功去订单详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
         placeholder: '请选择订单详情路径',
-        value: data.detailPath || {},
+        value: data.detailPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
       {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
+        label: '重新支付地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择重新支付地址',
         value: data.payPath || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-recharge-success {
-  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-recharge-success {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseSearch/Attr.js

@@ -1,154 +1,12 @@
 'use strict';
 
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
 export default {
   style: [],
-  advanced: [],
-  content: [
-    //文本信息
-    {
-      label: '标题名称:', //label
-      ele: 'el-input', //package 名称
-      type: 'text',
-      valueKey: 'title', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入标题名称',
-      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
-      rules: [
-        {
-          required: true,
-          type: 'url',
-          message: '请输入域名地址',
-          trigger: 'blur'
-        },
-      ]
-    },
+  content: [],
+  advanced: [
 
-    //远程获取内容选择
-    {
-      label: '跳转路径:', //label
-      ele: 'xd-select-list', //package 名称
-      valueKey: 'jumpToLink', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请选择加盟商',
-      multiple: false, //多选
-      collapseTags: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-    },
-
-    //本地固定内容选择
-    {
-      label: '选择内容:', //label
-      ele: 'xd-select-list', //package 名称
-      valueKey: 'select', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请选择选择内容',
-      multiple: false, //多选
-      remote: false,
-      list: [
-        {"label": "订单详情", "value": '/main/order/order'},
-        {"label": "购物车详情", "value": '/main/cart/cart'},
-        {"label": "商品详情", "value": '/main/product/product'},
-        {"label": "商品分类", "value": '/main/producttype/producttype'},
-      ],
-    },
-
-    //本地固定单选选择
-    {
-      label: '单选列表（固定）:', //label
-      ele: 'xd-radio', //package 名称
-      valueKey: 'radio_status_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-      list: [
-        {"label": "万利达集团", "value": 4},
-        {"label": "中国联通", "value": 5},
-        {"label": "中国移动", "value": 6},
-        {"label": "味多美", "value": 7},
-      ]
-    },
-
-    //远程固定单选选择
-    {
-      label: '单选列表（固定）:', //label
-      ele: 'xd-radio', //package 名称
-      valueKey: 'radio_status_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-    },
-
-    //本地固定多选选择
-    {
-      label: '多选列表（固定）:', //label
-      ele: 'xd-check', //package 名称
-      valueKey: 'xd-check_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-      list: [
-        {"label": "万利达集团", "value": 4},
-        {"label": "中国联通", "value": 5},
-        {"label": "中国移动", "value": 6},
-        {"label": "味多美", "value": 7},
-      ]
-    },
-
-    //远程多选选选择
-    {
-      label: '多选列表:', //label
-      ele: 'xd-check', //package 名称
-      valueKey: 'xd-check_remote-list', //form[valueKey]
-      value: 6, //v-model
-      disabled: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-    },
-
-    //状态(二选一)单选选择
-    {
-      label: '状态(二选一):', //label
-      ele: 'xd-radio-status', //package 名称
-      valueKey: 'radio_status', //form[valueKey]
-      value: 'Y', //v-model
-      isall: true,
-      disabled: true,
-      backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
-      placeholder: '请选择',
-      list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
-    },
-
-    //文本信息
-    {
-      label: '标题名称:', //label
-      ele: 'el-input', //package 名称
-      type: 'text',
-      valueKey: 'title', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入标题名称',
-      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
-      rules: [
-        {
-          required: true,
-          type: 'url',
-          message: '请输入域名地址',
-          trigger: 'blur'
-        },
-      ]
-    },
   ],
-}
+};

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -41,10 +41,7 @@
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {
-      return {
-
-        //todo
-      }
+      return {}
     },
     watch: {
       container(value) {
@@ -53,53 +50,27 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
+      // this.$xdAlert({
+      //   content:'此组件已弃用，请勿使用',
+      //   time:4000,
+      //   type:'error'
+      // })
     },
     methods: {
       onJfbLoad(options) {
-        console.log(this.layoutInfo, 'layoutInfolayoutInfolayoutInfo')
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(value) {
-
-        //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
+      init(container) {
 
-        //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
       handleSelect(select) {
-        console.log(select,'6666666')
         this.$xdRoot.$emit('onUserLocation', select);
         this.$xdUniHelper.navigateBack()
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        this.$xdUniHelper.navigateBack()
-        console.log('event.onJfbBack', options)
-      },
+
     }
   }