jufubao-base 1.0.130-beta5 → 1.0.130

package/src/components/JfbBaseMy/JfbBaseMyLess.less

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

package/src/components/JfbBaseMySetting/Attr.js

@@ -12,7 +12,7 @@ export default {
         ele: 'xd-select-pages-path',
         valueKey: 'bind_phone_url',
         value: data['bind_phone_url'] || null,
-        groupKey:'advanced',
+        //groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },

package/src/components/JfbBaseMySetting/JfbBaseMySettingLess.less

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

package/src/components/JfbBaseNotice/Attr.js

@@ -28,7 +28,6 @@ export default {
         ele: 'xd-site-news',
         valueKey: 'notice',
         value: data.notice || null,
-        groupKey:'content',
         className: 'input70',
         setting: {
           config: {
@@ -48,7 +47,7 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
+          let loading = XdBus.getParentApi('loading')({});
 
           //获取显示内容
           if (action === 'screen') {
@@ -92,7 +91,6 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -107,7 +105,6 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -121,7 +118,6 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -136,7 +132,6 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -151,7 +146,6 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -166,7 +160,6 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -180,7 +173,6 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -195,7 +187,6 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -210,7 +201,6 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -225,7 +215,6 @@ export default {
 
           //内容发布
           if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -240,7 +229,6 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
@@ -256,36 +244,25 @@ export default {
         ele: 'xd-radio',
         valueKey: 'style',
         value: data['style'] || '1',
-        groupKey:'content',
         list: [
           {"label": "静态显示", "value": '1'},
           {"label": "滚动显示", "value": '2'},
           {"label": "弹窗显示", "value": '3'},
-        ],
-        inline:false,
-        notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
+        ]
       },
 
-      {
-        ele: 'title',
-        label: '静态显示',
-        size: 'small',
-        groupKey:'style',
-      },
-      data.style === '1' && {
+      checkNotice() && checkPop() && checkScroll() && data.style === '1' && {
         label: '是否显示标题:',
         ele: 'xd-switch',
         valueKey: 'isTitle',
         value: data['isTitle'],
-        groupKey:'style',
         list: ['否', '是'],
         backValueType: 2,
       },
-      data.style === '1' && data['isTitle'] && {
+      checkNotice() && checkPop() && checkScroll() && data.style === '1' && data['isTitle'] && {
         label: '标题对其方式:',
         ele: 'xd-select-list',
         valueKey: 'textAlign',
-        groupKey:'style',
         className: 'input80',
         value: data['textAlign'] || '',
         list: [
@@ -294,12 +271,29 @@ export default {
           {"label": "右", "value": 'right'},
         ]
       },
-      data.style === '1' && {
+      checkNotice() && checkPop() && checkScroll() && {
+        label: '内容背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgc',
+        value: data.bgc || '',
+        placeholder: '请选择内容背景颜色',
+        classNmae: 'input80',
+      },
+      checkNotice() && checkPop() && checkScroll() && {
+        label: '内文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'textColor',
+        value: data.textColor || '',
+        placeholder: '请选择内文字颜色',
+        classNmae: 'input80',
+      },
+
+
+      checkNotice() && checkPop() && checkScroll() && data.style === '1' && {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
         value: data['radius'],
-        groupKey:'style',
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
@@ -313,30 +307,11 @@ export default {
             });
         },
       },
-      {
-        label: '内容背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgc',
-        groupKey:'style',
-        value: data.bgc || '',
-        placeholder: '请选择内容背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '内文字颜色:',
-        ele: 'xd-color',
-        groupKey:'style',
-        valueKey: 'textColor',
-        value: data.textColor || '',
-        placeholder: '请选择内文字颜色',
-        classNmae: 'input80',
-      },
-      {
+      checkNotice() && checkPop() && checkScroll() && {
         label: '内容文字大小:',
         ele: 'xd-site-select-list',
         valueKey: 'fontSize',
         value: data['fontSize'],
-        groupKey:'style',
         placeholder: '请选择内容文字大小',
         multiple: false,
         className: 'input80',
@@ -350,42 +325,45 @@ export default {
             });
         },
       },
-      {
-        label: '内容填充设置:',
+      checkNotice() && checkPop() && checkScroll() && {
+        label: '内容边距设置:',
         ele: 'xd-margin-padding',
-        valueKey: 'padding',
-        groupKey:'style',
-        value: data.padding || null,
+        valueKey: 'margin',
+        value: data.margin || null,
+        disabled: false,
         setting: {
-          type: 'padding',
+          type: 'margin',
         },
-        placeholder: '请内容填充设置',
+        placeholder: '请设置内容边距设置',
         inline: false,
-        notice: '内容填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
-      {
-        label: '边距设置:',
+      checkNotice() && checkPop() && checkScroll() && {
+        label: '内容填充设置:',
         ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'margin',
-        value: data.margin || null,
+        valueKey: 'padding',
+        value: data.padding || null,
+        disabled: false,
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置内容边距设置',
+        placeholder: '请内容填充设置',
         inline: false,
-        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '内容填充设置，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
-      {
-        ele: 'title',
-        label: '滚动显示',
-        size: 'small',
-        groupKey:'style',
+      checkNotice() && !checkPop() && checkScroll() && {
+        label: '弹窗间隔:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'time',
+        value: data.time || '',
+        placeholder: '请输入弹窗间隔，默认值：3小时',
+        className: 'input80',
+        unit: '小时'
       },
-      {
+      checkNotice() && checkPop() && !checkScroll() && {
         label: '滚动显示条数:',
         ele: 'el-input',
-        groupKey:'style',
         type: 'number',
         valueKey: 'num',
         value: data.num,
@@ -393,11 +371,10 @@ export default {
         className: 'input80',
         unit: '条'
       },
-      {
+      checkNotice() && checkPop() && !checkScroll() && {
         label: '滚动速度值:',
         ele: 'el-input',
         type: 'number',
-        groupKey:'style',
         valueKey: 'speed',
         value: data.speed,
         placeholder: '请输入滚动速度值，默认：20',
@@ -405,12 +382,12 @@ export default {
         inline: false,
         notice: '滚动速度值，建议取值：20-60， 值越大越快',
       },
-      {
-        label: '边距设置:',
+      checkNotice() && checkPop() && !checkScroll() && {
+        label: '内容边距设置:',
         ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'scrollMargin',
-        value: data.scrollMargin || null,
+        valueKey: 'margin',
+        value: data.margin || null,
+        disabled: false,
         setting: {
           type: 'margin',
         },
@@ -418,24 +395,6 @@ export default {
         inline: false,
         notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
-
-      {
-        ele: 'title',
-        label: '弹窗显示',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '弹窗间隔:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey:'style',
-        valueKey: 'time',
-        value: data.time || '',
-        className: 'input80',
-        inline: false,
-        notice: '弹窗间隔，单位：小时。默认值：<span style="color: red">3</span>小时',
-      },
     ].filter(i=>i)
   },
   advanced: [