jufubao-base 1.0.131 → 1.0.132-beta2

package/src/components/JfbBaseTestApi/JfbBaseTestApiLess.less

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

package/src/components/JfbBaseTestBody/JfbBaseTestBodyLess.less

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

package/src/components/JfbBaseTestBottom/JfbBaseTestBottomLess.less

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

package/src/components/JfbBaseTestNotice/JfbBaseTestNoticeLess.less

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

package/src/components/JfbBaseTestTop/JfbBaseTestTopLess.less

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

package/src/components/JfbBaseUserCenter/Attr.js

@@ -11,12 +11,14 @@ export default {
         label: '',
         ele: 'slot',
         slot: 'is_reference_title',
+        groupKey:'advanced',
       },
       {
         label: '卡券自定义名称:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'cardName',
+        groupKey:'content',
         value: data['cardName'] || '',
         placeholder: '请输入卡券自定义名称',
         className: 'input80',
@@ -36,45 +38,23 @@ export default {
         label: '卡券文字颜色:',
         ele: 'xd-color',
         valueKey: 'cardNameColor',
+        groupKey:'style',
         value: data['cardNameColor'] || null,
         placeholder: '请选择卡券文字颜色',
         classNmae: 'input80',
       },
+
       {
         ele: 'title',
         label: '整体风格',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '外边距:',
-        ele: 'xd-margin-padding',
-        valueKey: 'bodyMargin',
-        value: data['bodyMargin'] || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
-      },
-      {
-        label: '填充:',
-        ele: 'xd-margin-padding',
-        valueKey: 'bodyPadding',
-        value: data['bodyPadding'] || null,
-        disabled: false,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：0像素',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'bodyBackgroundColor',
+        groupKey:'style',
         value: data['bodyBackgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
@@ -83,6 +63,7 @@ export default {
         label: '圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'bodyRadius',
+        groupKey:'style',
         value: data['bodyRadius'],
         placeholder: '请选择圆角设置',
         multiple: false,
@@ -97,16 +78,55 @@ export default {
             });
         },
       },
+      {
+        label: '间距:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'padding',
+        groupKey:'style',
+        value: data.padding || '',
+        placeholder: '请输入间距',
+        className: 'input60',
+        inline: false,
+        notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyMargin',
+        groupKey:'style',
+        value: data['bodyMargin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: '填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyPadding',
+        groupKey:'style',
+        value: data['bodyPadding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：0像素',
+      },
       {
         ele: 'title',
         label: '内容区域风格',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
-
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
+        groupKey:'style',
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
@@ -115,6 +135,7 @@ export default {
         label: '按钮背景颜色:',
         ele: 'xd-color',
         valueKey: 'btnBgColor',
+        groupKey:'style',
         value: data['btnBgColor'] || null,
         placeholder: '请选择按钮背景颜色',
         classNmae: 'input80',
@@ -123,6 +144,7 @@ export default {
         label: '按钮文字颜色:',
         ele: 'xd-color',
         valueKey: 'btnTextColor',
+        groupKey:'style',
         value: data['btnTextColor'] || null,
         placeholder: '请选择按钮文字颜色',
         classNmae: 'input80',
@@ -131,6 +153,7 @@ export default {
         label: '按钮文字大小:',
         ele: 'xd-site-select-list',
         valueKey: 'btnFontSize',
+        groupKey:'style',
         value: data['btnFontSize'] || '',
         placeholder: '请选择按钮文字大小',
         multiple: false,
@@ -147,24 +170,18 @@ export default {
             });
         },
       },
-      {
-        label: '间距:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: data.padding || '',
-        placeholder: '请输入间距',
-        className: 'input80',
-      },
+
       {
         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,
@@ -178,6 +195,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
@@ -187,6 +205,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'is_border_w',
+        groupKey:'style',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
@@ -195,6 +214,7 @@ export default {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: data['radius'] || '10',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -210,14 +230,10 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '其他设置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '添加卡券路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'add_url', //form[valueKey]
+        label: '添加卡券路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'add_url',
+        groupKey:'advanced',
         placeholder: '请选择添加卡券路径',
         value: data['add_url'] || null,
         setting: {
@@ -229,9 +245,10 @@ export default {
         inline: false,
       },
       {
-        label: '设置支付密码路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'pwd_url', //form[valueKey]
+        label: '设置支付密码路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'pwd_url',
+        groupKey:'advanced',
         placeholder: '请选择设置支付密码路径',
         value: data['pwd_url'] || null,
         setting: {
@@ -243,9 +260,10 @@ export default {
         inline: false,
       },
       {
-        label: '进入我的票券路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'card_url', //form[valueKey]
+        label: '进入我的票券路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'card_url',
+        groupKey:'advanced',
         placeholder: '请选择进入我的票券路径',
         value: data['card_url'] || null,
         setting: {
@@ -260,6 +278,7 @@ export default {
         label: '',
         ele: 'slot',
         slot: 'is_reference',
+        groupKey:'advanced',
       },
     ].filter(i=>i)
   },