jufubao-base 1.0.128 → 1.0.130-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.128",
+  "version": "1.0.130-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -48,6 +48,7 @@
     "@vue/shared": "^3.0.0",
     "color": "^3.1.3",
     "core-js": "^2.6.5",
+    "dingtalk-jsapi": "^3.0.31",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
     "gxd-uni-library-editx": "1.0.17-beta2",
@@ -56,10 +57,10 @@
     "path-to-regexp": "^6.2.1",
     "qs": "^6.9.6",
     "regenerator-runtime": "^0.12.1",
+    "vconsole": "^3.15.0",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",
-    "vuex": "^3.2.0",
-    "vconsole": "^3.15.0"
+    "vuex": "^3.2.0"
   },
   "repository": {
     "type": "git",

package/src/components/JfbBaseAddress/Attr.js

@@ -1,23 +1,29 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,}, null, 'list');
+let styleForm = new StyleForm(
+  {border: null, shadow: null, spacing: '',  bgColor:'',  margin: null},
+  null,
+  'list',
+  true
+);
 export default {
   style: [],
   advanced: [],
   content: (data)=>{
     return [
       {
-        label: '选取地区路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'location_url', //form[valueKey]
+        label: '选取地区路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'location_url',
         placeholder: '请选择选取地区路径',
+        groupKey:'advanced',
         value: data.location_url || '',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
-      ...styleForm.getForm(data, '内容配置')
+      ...styleForm.getForm(data, '内容列表样式配置')
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -22,7 +22,7 @@
       :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
     >
       <view
-        :style="{ margin: jfbListMarginComputed }"
+        :style="{ padding: jfbListMarginComputed }"
         class="jfb-base-address__body-address"
         v-if="addressList && addressList.length > 0"
       >
@@ -106,7 +106,7 @@
         <xd-font-icon icon="iconbianzu-01" size="120"></xd-font-icon>
         <view>您还没有收货地址哦！</view>
       </view>
-      <view style="height: 100rpx"></view>
+      <view style="height: 110rpx"></view>
       <view class="jfb-base-address__body-footer" :style="prod_bottom">
         <xd-button
           width="80%"
@@ -154,7 +154,7 @@ let styleForm = new StyleForm(
   {
     border: null,
     shadow: null,
-    spacing: 24,
+    spacing: 20,
     bgColor: "#FFFFFF",
     margin: {
       bottom: 20,

package/src/components/JfbBaseAddress/JfbBaseAddressLess.less

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

package/src/components/JfbBaseAfterOrderDetail/Attr.js

@@ -8,36 +8,41 @@ export default {
   content: (data) => {
     return [
       {
-        label: '外边距:',
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         value: data['margin'] || null,
-        disabled: false,
+        groupKey:'style',
         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: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'padding',
         value: data.padding || '',
         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,
@@ -51,6 +56,7 @@ export default {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
+        groupKey:'style',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
@@ -59,6 +65,7 @@ export default {
         label: '投影范围:',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
+        groupKey:'style',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
         multiple: false,
@@ -79,12 +86,14 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
+        groupKey:'style',
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
@@ -97,6 +106,7 @@ export default {
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -107,6 +117,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'is_border_w',
+        groupKey:'style',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
@@ -116,6 +127,7 @@ export default {
         ele: 'xd-site-select-list',
         valueKey: 'radius',
         value: data['radius'] || '',
+        groupKey:'style',
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue

@@ -184,9 +184,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")
@@ -345,7 +347,7 @@ export default {
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  
+
   &-icon {
     margin-right: unit(10, rpx);
   }

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetailLess.less

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

package/src/components/JfbBaseAfterOrderList/Attr.js

@@ -6,22 +6,23 @@ 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',
+        groupKey:'style',
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
@@ -31,19 +32,24 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
+        groupKey:'style',
         value: data.padding || '',
         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,
@@ -57,6 +63,7 @@ export default {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
+        groupKey:'style',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
@@ -65,6 +72,7 @@ export default {
         label: '投影范围:',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
+        groupKey:'style',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
         multiple: false,
@@ -85,13 +93,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',
@@ -104,6 +114,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
@@ -112,6 +123,7 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
@@ -121,6 +133,7 @@ export default {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -136,15 +149,11 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '其他',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
-        placeholder: '请选择订单详情路径',
+        label: '售后订单详情路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
+        placeholder: '请选择售后订单详情路径',
         value: data['detailPath'] ||null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -168,9 +168,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")
@@ -195,12 +197,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
       this.backgroundColor = getContainerPropsValue(
         container,

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderListLess.less

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

package/src/components/JfbBaseBack/JfbBaseBackLess.less

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

package/src/components/JfbBaseBackground/Attr.js

@@ -8,19 +8,20 @@ export default {
   content:(params)=>{
     return [
       {
-        label: '背景图配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'background', //form[valueKey]
+        label: '背景图配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'background',
+        groupKey:'content',
         className: 'input80',
-        value: params.background || {size:{"width":"750","height":"1280"}},
+        value: params.background || {size:{"width":"750", "height":"1500"}},
         setting: {
           count: 1,
-          scene: {label: '背景', value: 'normal'},
+          scene: { label: '背景', value: 'normal'},
           width: 750,
-          height: 1280
+          height: 1500,
+          disabled: true,
         },
         handleCustom({action, data}) {
-          console.log(data,'datadata');
           //设置场景参数
           if(data) {
             data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
@@ -214,7 +215,7 @@ export default {
           }
         },
         inline: false,
-        notice: '',
+        notice: '设置背景图片时候，建议上传图片尺寸大小为:<span style="color:red">750 * 1500</span>像素',
       }
     ].filter(i=>i)
   },

package/src/components/JfbBaseBackground/JfbBaseBackground.vue

@@ -82,9 +82,6 @@ export default {
         this.$xdLog.catch(error)
       }
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
     onJfbUpdate() {
       this.init();
     }