jufubao-base 1.0.129 → 1.0.130-beta3

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -14,25 +14,27 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-entry__body" :style="bodyStyle">
-      <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
-        <view v-for="i in 5" :key="i"
-          :class="'row_num_'+rowNum"
-          class="entry_item"
-        >
-          <image v-if="rowNum == 1" style="height: 260rpx;"/>
-          <image v-if="rowNum == 2" style="height: 200rpx;"/>
-          <image v-if="rowNum == 3" style="height: 150rpx;"/>
+      <view :style="{ margin:marginUi}">
+        <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
+          <view v-for="i in 5" :key="i"
+            :class="'row_num_'+rowNum"
+            class="entry_item"
+          >
+            <image v-if="rowNum == 1" style="height: 260rpx;"/>
+            <image v-if="rowNum == 2" style="height: 200rpx;"/>
+            <image v-if="rowNum == 3" style="height: 150rpx;"/>
+          </view>
         </view>
-      </view>
-      <view v-else class="entry_list" :style="entryStyle">
-        <view v-for="(item,i) in entryList" :key="i"
-          class="entry_item"
-          :class="'row_num_'+rowNum"
-          @click="toLink(item)"
-        >
-          <image v-if="rowNum == 1" :src="item.image_url" mode="widthFix"/>
-          <image v-if="rowNum == 2" :src="item.image_url2" mode="widthFix"/>
-          <image v-if="rowNum == 3" :src="item.image_url3" mode="widthFix"/>
+        <view v-else class="entry_list" :style="entryStyle">
+          <view v-for="(item,i) in entryList" :key="i"
+            class="entry_item"
+            :class="'row_num_'+rowNum"
+            @click="toLink(item)"
+          >
+            <image v-if="rowNum == 1" :src="item.image_url" mode="widthFix"/>
+            <image v-if="rowNum == 2" :src="item.image_url2" mode="widthFix"/>
+            <image v-if="rowNum == 3" :src="item.image_url3" mode="widthFix"/>
+          </view>
         </view>
       </view>
     </view>
@@ -63,13 +65,14 @@
         rowNum: 1,
         paddingInput: 20,
         loadingList: true,
+        margin: {},
       }
     },
     computed: {
       bodyStyle(){
         return {
           backgroundColor: this.bgcolor,
-          minHeight: this.layoutInfo.bodyMinHeight
+          minHeight: this.layoutInfo.bodyMinHeight,
         }
       },
       entryStyle(){
@@ -78,6 +81,13 @@
           gap: this.paddingInput + 'rpx',
           padding: this.paddingInput + 'rpx'
         }
+      },
+      marginUi(){
+        let str = `${this.checkValue(this.margin.top, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.right, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.bottom, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.left, 0)}rpx`;
+        return str
       }
     },
     watch: {
@@ -100,6 +110,7 @@
         this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
         this.rowNum = getContainerPropsValue(container, 'content.rowNum', 1);
         this.paddingInput = getContainerPropsValue(container, 'content.paddingInput', 20);
+        this.margin = getContainerPropsValue(container, 'content.margin', {});
       },
       getEntrySetting(){
         this.$xdShowLoading({});
@@ -115,7 +126,7 @@
             item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
             item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
             let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
-            
+
             //外站配置地址
             if(item.redirect_type === 'URL') {
               if(item['redirect_data']['path'].indexOf('?') === -1) {
@@ -124,12 +135,12 @@
               else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
               return item;
             }
-            
+
             let jumpUrl = item.path;
             //#ifdef H5
             jumpUrl = `//${host}/${dir}${path}`;
             //#endif
-            
+
             if(item['redirect_data']['fixed_business_code'] === '') {
               item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
             }
@@ -155,7 +166,7 @@
           this.$xdAlert({content: '链接地址配置错误'})
         }
       },
-      
+
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack()
       },

package/src/components/JfbBaseEntry/JfbBaseEntryLess.less

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

package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetailLess.less

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

package/src/components/JfbBaseFastLink/Api.js

@@ -2,59 +2,6 @@
 
 /**
  * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
  * @type {*[]}
  */
-module.exports = [
-  {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
-    isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];
+module.exports = [];

package/src/components/JfbBaseFastLink/Attr.js

@@ -11,102 +11,54 @@ export default {
         label: '', //label
         ele: 'slot', //package 名称
         slot: 'is_reference_title',
+        groupKey: 'advanced'
       },
       {
-        ele: 'title',
-        label: '基础设置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '布局:',
+        label: '快速链接布局:',
         ele: 'xd-radio',
         valueKey: 'is_layout',
         value: data['is_layout'] || 'noraml',
+        groupKey:'content',
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
         list: [
           {label: '平铺', value: 'noraml'},
           {label: '悬浮', value: 'fixed'},
-        ]
+        ],
+        inline: false,
+        notice: `使用悬浮布局时，快速链接数量不可超过<span style="color:red"> 3 </span>个，并且把该组件移动到最后`
       },
       data['is_layout'] ==='fixed' && {
         label: '自定义名称:',
         ele: 'el-input',
         type: 'text',
+        groupKey:'content',
         valueKey: 'fastName',
         value: data['fastName']? data['fastName']: '快速导航',
         placeholder: '请输入自定义名称',
         className: 'input80',
       },
       {
-        label: '快速链接配置:', //label
-        ele: 'xd-footer-setting', //package 名称
-        valueKey: 'quick_link_list', //form[valueKey]
-        value: data.quick_link_list || [],
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-          showField: {
-            path: true,
-            icon: true,
-            notice: false,
-            subTitle: true,
-          }
-        },
-        handleCustom({action, data}) {
-          if (action === 'number') {
-            data.cb([])
-          }
-        },
-        inline: false,
-        notice: '设置快速链接配置址、标题(最多<sapn style="color: red">五个汉字</sapn>)、ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）和是否有消息数量显示（无数量显示可以不填写）',
-        rules: [
-          {
-            required: false,
-            validator: (rule, value, callback) => {
-              if (!value) {
-                callback('请设置快速链接配置');
-                return
-              }
-
-              if (value.length === 0) {
-                callback('请设置快速链接配置');
-                return
-              }
-
-              let status = value.filter(item => {
-                return !item.name
-              });
-
-              if (status.length > 0) {
-                callback('请设置快速链接配置');
-                return
-              }
-
-              callback()
-            },
-            trigger: 'change'
-
-          },
-        ],
-      },
-      data['is_layout'] ==='noraml' && {
-        ele: 'title',
-        label: '样式设置',
-        size: 'small', //default/mini/small
+        label: '背景颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'backgroundColor',
+        value: data['backgroundColor'] || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input60',
       },
-      data['is_layout'] ==='noraml' && {
-        label: '文字大小:',
+      {
+        label: '圆角设置:',
         ele: 'xd-site-select-list',
-        valueKey: 'fontSize',
-        value: data['fontSize'] || '',
-        placeholder: '请选择文字大小',
+        valueKey: 'radius',
+        groupKey:'style',
+        value: data['radius'] || '',
+        placeholder: '请选择圆角设置',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_font_size'
-          })
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
               data.cb(res.list)
             })
@@ -115,61 +67,42 @@ export default {
             });
         },
       },
-      data['is_layout'] ==='noraml' && {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'backgroundColor',
-        value: data['backgroundColor'] || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      data['is_layout'] ==='noraml' && {
-        label: '文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'textColor',
-        value: data['textColor'] || '',
-        placeholder: '请选择文字颜色',
-        classNmae: 'input80',
-      },
-      data['is_layout'] ==='noraml' && {
-        label: 'ICON颜色:',
-        ele: 'xd-color',
-        valueKey: 'iconColor',
-        value: data['iconColor'] || '',
-        placeholder: '请选择ICON颜色',
-        classNmae: 'input80',
-      },
-      data['is_layout'] ==='noraml' && {
+      {
         label: '间距:',
         ele: 'el-input',
+        groupKey:'style',
         type: 'number',
         valueKey: 'padding',
         value: data.padding===undefined? data.padding: '',
         placeholder: '请输入间距',
-        className: 'input80',
+        className: 'input60',
+        inline: false,
+        notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data['is_layout'] ==='noraml' && {
-        label: '内容边距设置:',
+      {
+        label: '外边距设置:',
         ele: 'xd-margin-padding',
+        groupKey:'style',
         valueKey: 'margin',
         value: data['margin'] || null,
-        disabled: false,
         setting: {
           type: 'margin',
         },
-        placeholder: '请设置内容边距设置',
+        placeholder: '外边距设置',
         inline: false,
-        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data['is_layout'] ==='noraml' && {
+      {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
-      data['is_layout'] ==='noraml' && {
+      {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
+        groupKey:'style',
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
@@ -179,33 +112,44 @@ export default {
           {label: '否', value: 'N'},
         ]
       },
-      data['is_layout'] ==='noraml' && data['is_border'] === 'Y' && {
+      data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
       },
-      data['is_layout'] ==='noraml' && data['is_border'] === 'Y' && {
+      data['is_border'] === 'Y' && {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
-        className: 'input80',
+        className: 'input60',
+      },
+      {
+        ele: 'title',
+        label: '主标题',
+        size: 'small',
+        groupKey:'style',
       },
-      data['is_layout'] ==='noraml' && {
-        label: '内容圆角设置:',
+      {
+        label: '文字大小:',
         ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '',
-        placeholder: '请选择内容圆角设置',
+        valueKey: 'fontSize',
+        groupKey:'style',
+        value: data['fontSize'] || '',
+        placeholder: '请选择文字大小',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_font_size'
+          })
             .then(res => {
               data.cb(res.list)
             })
@@ -215,9 +159,117 @@ export default {
         },
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
+        label: '文字颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'textColor',
+        value: data['textColor'] || '',
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: 'ICON颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'iconColor',
+        value: data['iconColor'] || '',
+        placeholder: '请选择ICON颜色',
+        classNmae: 'input80',
+      },
+      {
+        ele: 'title',
+        label: '副标题',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '文字大小:',
+        ele: 'xd-site-select-list',
+        valueKey: 'fontSubSize',
+        groupKey:'style',
+        value: data['fontSubSize'] || '',
+        placeholder: '请选择文字大小',
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_font_size'
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '文字颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'textSubColor',
+        value: data['textSubColor'] || '',
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+      },
+
+      {
+        label: '快速链接配置:',
+        ele: 'xd-footer-setting',
+        valueKey: 'quick_link_list',
+        groupKey:'advanced',
+        value: data.quick_link_list || [],
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+          showField: {
+            path: true,
+            icon: true,
+            notice: false,
+            subTitle: true,
+          }
+        },
+        handleCustom({action, data}) {
+          if (action === 'number') {
+            data.cb([])
+          }
+        },
+        inline: false,
+        notice: '设置快速链接配置址、标题(最多<sapn style="color: red">五个汉字</sapn>)、ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）和是否有消息数量显示（无数量显示可以不填写）',
+        rules: [
+          {
+            required: false,
+            validator: (rule, value, callback) => {
+              if (!value) {
+                callback('请设置快速链接配置');
+                return
+              }
+
+              if (value.length === 0) {
+                callback('请设置快速链接配置');
+                return
+              }
+
+              let status = value.filter(item => {
+                return !item.name
+              });
+
+              if (status.length > 0) {
+                callback('请设置快速链接配置');
+                return
+              }
+
+              callback()
+            },
+            trigger: 'change'
+
+          },
+        ],
+      },
+      {
+        label: '',
+        ele: 'slot',
         slot: 'is_reference',
+        groupKey: 'advanced'
       },
     ].filter(i=>i)
   },