jufubao-base 1.0.130-beta5 → 1.0.130

package/src/components/JfbBaseBackground/JfbBaseBackgroundLess.less

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

package/src/components/JfbBaseBlock/Attr.js

@@ -6,18 +6,11 @@
 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',
     },
@@ -26,17 +19,14 @@ export default {
       ele: 'el-input',
       type: 'number',
       valueKey: 'height',
-      groupKey:'style',
       value: null,
-      classNmae: 'input60',
-      inline: false,
-      notice:'占位框高度，单位像素，默认：<span style="color:red">20</span>像素'
+      placeholder: '请输入占位框高度，单位像素，默认：20px',
+      classNmae: 'input80',
     },
     {
       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,6 +57,13 @@
         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,8 +13,9 @@
 
 //start
 .jfb-base-block {
+  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-block {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
+  &:before {
+    content: " ";
+    display: table;
+  }
 }
 /**endNotPreview**/

package/src/components/JfbBaseBottomNotice/JfbBaseBottomNoticeLess.less

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

package/src/components/JfbBaseCard/Attr.js

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

package/src/components/JfbBaseCard/JfbBaseCardLess.less

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