jufubao-base 1.0.133 → 1.0.134-beta3

package/src/components/JfbBaseBackground/JfbBaseBackgroundLess.less

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

package/src/components/JfbBaseBlock/Attr.js

@@ -6,11 +6,18 @@
 export default {
   style: [],
   content: [
+    {
+      label: '',
+      ele: 'slot',
+      slot: 'is_reference_title',
+      groupKey:'advanced',
+    },
     {
       label: '背景颜色:',
       ele: 'xd-color',
       valueKey: 'bgcolor',
       value: '',
+      groupKey:'style',
       placeholder: '请输入占位框背景颜色',
       classNmae: 'input80',
     },
@@ -19,14 +26,17 @@ export default {
       ele: 'el-input',
       type: 'number',
       valueKey: 'height',
+      groupKey:'style',
       value: null,
-      placeholder: '请输入占位框高度，单位像素，默认：20px',
-      classNmae: 'input80',
+      classNmae: 'input60',
+      inline: false,
+      notice:'占位框高度，单位像素，默认：<span style="color:red">20</span>像素'
     },
     {
       label: '',
       ele: 'slot',
       slot: 'is_reference',
+      groupKey:'advanced',
     },
   ],
   advanced: [],

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -29,7 +29,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import {getContainerPropsValue} from "@/utils/xd.base";
-  
+
   export default {
     name: "JfbBaseBlock",
     components: {
@@ -57,13 +57,6 @@
         if (bgcolor) this.bgcolor = bgcolor;
         if (height) this.height = height;
       },
-      onJfbLoad(options) {
-      
-      },
-      
-      onJfbCustomEvent(data){
-        console.log('onJfbCustomEvent',data);
-      }
     }
   }
 

package/src/components/JfbBaseBlock/JfbBaseBlockLess.less

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

package/src/components/JfbBaseBottomNotice/JfbBaseBottomNoticeLess.less

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

package/src/components/JfbBaseCard/Attr.js

@@ -9,6 +9,7 @@ export default {
         label: "票券布局",
         ele: "xd-radio",
         valueKey: "cardLayout",
+        groupKey:'content',
         value: data.cardLayout || "1",
         list: [
           {label: "布局1", value: "1"},
@@ -16,21 +17,30 @@ export default {
         ]
       },
       {
-        label: '票券登陆文案:',
+        label: '票券登录文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'login_name',
+        groupKey:'content',
         value: data.login_name || '',
-        placeholder: '请输入票券登陆文案',
+        placeholder: '请输入票券登录文案',
         className: 'input80',
         inline: false,
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
       },
+
+      {
+        ele: 'title',
+        label: '登录样式设置',
+        size: 'small',
+        groupKey: 'style',
+      },
       {
         label: "登录文字大小",
         ele: "el-input",
         type: "number",
         valueKey: "login_text_size",
+        groupKey: 'style',
         value: data.login_text_size || 24,
         placeholder: "请输入登录文字大小",
         className: "input80",
@@ -40,6 +50,7 @@ export default {
         label: "登录字体颜色配置",
         ele: 'xd-color',
         valueKey: "login_text_color",
+        groupKey: 'style',
         value: data.login_text_color || '',
         className: "input80",
         inline: false,
@@ -48,6 +59,7 @@ export default {
         label: "登录背景颜色配置",
         ele: 'xd-color',
         valueKey: "login_text_bg_color",
+        groupKey: 'style',
         value: data.login_text_bg_color || '',
         className: "input80",
         inline: false,
@@ -56,6 +68,7 @@ export default {
         label: "登录按钮圆角配置",
         ele: 'xd-site-select-list',
         valueKey: "login_text_radius",
+        groupKey: 'style',
         value: data.login_text_radius || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -71,11 +84,18 @@ export default {
         },
       },
 
+      {
+        ele: 'title',
+        label: '查看样式设置',
+        size: 'small',
+        groupKey: 'style',
+      },
       {
         label: "查看文字大小",
         ele: "el-input",
         type: "number",
         valueKey: "look_text_size",
+        groupKey: 'style',
         value: data.look_text_size || 24,
         placeholder: "请输入登录文字大小",
         className: "input80",
@@ -85,6 +105,7 @@ export default {
         label: "查看字体颜色配置",
         ele: 'xd-color',
         valueKey: "look_text_color",
+        groupKey: 'style',
         value: data.look_text_color || '',
         className: "input80",
         inline: false,
@@ -93,6 +114,7 @@ export default {
         label: "查看背景颜色配置",
         ele: 'xd-color',
         valueKey: "look_text_bg_color",
+        groupKey: 'style',
         value: data.look_text_bg_color || '',
         className: "input80",
         inline: false,
@@ -101,6 +123,7 @@ export default {
         label: "查看按钮圆角配置",
         ele: 'xd-site-select-list',
         valueKey: "look_text_radius",
+        groupKey: 'style',
         value: data.look_text_radius || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -116,11 +139,12 @@ export default {
         },
       },
 
-      
+
       {
-        label: '失效卡列表地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'disabled_url', //form[valueKey]
+        label: '失效卡列表地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'disabled_url',
+        groupKey:'advanced',
         placeholder: '请选择失效卡列表地址',
         value: data.disabled_url || null,
         setting: {
@@ -129,9 +153,10 @@ export default {
         inline: false,
       },
       {
-        label: '卡券详情地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detail_url', //form[valueKey]
+        label: '卡券详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detail_url',
+        groupKey:'advanced',
         placeholder: '请选择卡券详情地址',
         value: data.detail_url || null,
         setting: {
@@ -140,9 +165,10 @@ export default {
         inline: false,
       },
       {
-        label: '卡券转换地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'change_url', //form[valueKey]
+        label: '卡券转换地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'change_url',
+        groupKey:'advanced',
         placeholder: '请选择卡券转换地址',
         value: data.change_url || null,
         setting: {
@@ -151,9 +177,10 @@ export default {
         inline: false,
       },
       {
-        label: '卡券密码绑定地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'bind_url', //form[valueKey]
+        label: '卡券密码绑定地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'bind_url',
+        groupKey:'advanced',
         placeholder: '请选择卡券密码绑定地址',
         value: data.bind_url || null,
         setting: {
@@ -162,9 +189,10 @@ export default {
         inline: false,
       },
       {
-        label: '扫码绑定卡券确认地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'confirm_url', //form[valueKey]
+        label: '扫码绑定卡券确认地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'confirm_url',
+        groupKey:'advanced',
         placeholder: '请选择扫码绑定卡券确认地址',
         value: data.confirm_url || null,
         setting: {
@@ -176,8 +204,9 @@ export default {
         label: '综合福利入口页:',
         ele: 'xd-select-pages-path',
         valueKey: 'allEntryPath',
+        groupKey:'advanced',
         placeholder: '请选择综合福利入口页',
-        value: null,
+        value: data.allEntryPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -187,6 +216,7 @@ export default {
         label: '提示内容:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data.notice || null,
         className: 'input70',
         setting: {
@@ -205,10 +235,11 @@ export default {
             //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
             //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
           }
-  
+
+          //获取返回参数(场景类型名称为必填)
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
-  
+          let loading = { close(){}}
+
           //获取显示内容
           if (action === 'screen') {
             XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
@@ -220,9 +251,9 @@ export default {
                 console.error(error);
                 loading.close();
               });
-  
+
           }
-  
+
           //获取返回参数(广告位高度必选项)
           if (action === 'getNewsInfo') {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
@@ -235,7 +266,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //获取产品业务线列表
           if (action === 'namespace') {
             XdBus.getParentApi('getOptionsNamespaces')({})
@@ -248,9 +279,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -262,9 +294,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -275,9 +308,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -289,9 +323,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -303,9 +338,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -317,9 +353,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -330,9 +367,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -344,9 +382,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -358,9 +397,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -372,9 +412,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -386,9 +427,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -314,7 +314,7 @@ export default {
       loadingCardList: true,
 
       //页面跳转地址
-      login_name:'',//登陆文案
+      login_name:'',//登录文案
       changeUrl: "",
       bindUrl: "",
       detailUrl: "",
@@ -542,7 +542,7 @@ export default {
         }
       }
 
-      //登陆成功调整地址优先级
+      //登录成功调整地址优先级
       this.inCallback = inCallback || this.allEntryPath || this.settings.index;
       this.getContent();
 

package/src/components/JfbBaseCard/JfbBaseCardLess.less

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