jufubao-base 1.0.289-beta2 → 1.0.290-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.289-beta2",
+  "version": "1.0.290-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseFooter/Attr.js

@@ -1,18 +1,163 @@
 'use strict';
-
-import style from "./cusAttr/style";
-import advanced from "./cusAttr/advanced";
-import content from "./cusAttr/content";
+import ICONS from '@/ICONS'
 
 export default {
   style: [],
-  content: (data, gValue, gColor, oldData={}) => {
+  advanced: [],
+  content:(data)=>{
+    let footerSettingImage = [];
+    let footerSetting = [];
+    if(data['footerSettingImage'] && data['footerSettingImage'].length > 0 ) {
+      footerSettingImage = data['footerSettingImage'];
+    }
+    if(data['footer-setting'] && data['footer-setting'].length > 0){
+      footerSetting = data['footer-setting'];
+      footerSetting.map((item,index)=>{
+        if(!footerSettingImage[index]) footerSettingImage[index] = {};
+        footerSettingImage[index] = Object.assign({},JSON.parse(JSON.stringify(item)),footerSettingImage[index])
+      })
+    }
     return [
-      ...content(data, gValue, gColor, oldData),
-      ...style(data, gValue, gColor, oldData),
-      ...advanced(data, gValue, gColor,oldData ),
-    ].filter(i => i)
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey: 'advanced',
+      },
+      {
+        label: '背景图设置:',
+        ele: 'xd-upload',
+        valueKey: 'backgroundImage',
+        groupKey:'content',
+        value: data.backgroundImage || {},
+        defaultValue: data.backgroundImage || null,
+        slot: true,
+        oneWidth: 375,
+        oneHeight: 55,
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB。建议尺寸：<span style="color:red">750*110</span>像素',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: .5,
+        action: 'action',
+        sort: true,
+        maxlen: 1,
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        groupKey:'content',
+        value: data['bgColor'] || '',
+        placeholder: '请选择背景颜色',
+        setting: {
+          isAlpha: false
+        },
+        classNmae: 'input80',
+      },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'borderColor',
+        groupKey:'content',
+        value: data['borderColor'] || '',
+        placeholder: '请选择边框颜色',
+        setting: {
+          isAlpha: false
+        },
+        classNmae: 'input80',
+      },
+      {
+        label: '菜单文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'color',
+        groupKey:'content',
+        value: data['color'] || '',
+        setting: {
+          isAlpha: false
+        },
+        placeholder: '请选择菜单文字颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '菜单文字选中颜色:',
+        ele: 'xd-color',
+        valueKey: 'selectedColor',
+        groupKey:'content',
+        setting: {
+          isAlpha: false
+        },
+        value:data['selectedColor'] || '',
+        placeholder: '请选择菜单文字选中颜色',
+        classNmae: 'input80',
+      },
+      footerSetting.length > 0 && {
+        label: '菜单图片配置:',
+        ele: 'xd-footer-setting',
+        valueKey: 'footerSettingImage',
+        groupKey:'content',
+        value: footerSettingImage,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+          hideAdd: true,
+          showField: {
+            path: false,
+            icon: false,
+            notice: false,
+            image: true,
+            actImage: true
+          }
+        },
+        handleCustom({action,data}){
+          if(action === 'number') {
+            XdBus.getParentApi('getOptionsNoticeNumber')()
+              .then(res => {
+                data.cb(res.list)
+              })
+              .catch();
+          }
+        },
+      },
+
+      {
+        label: '菜单配置:',
+        ele: 'xd-footer-setting',
+        valueKey: 'footer-setting',
+        groupKey:'advanced',
+        value: footerSetting,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+          icons:ICONS,
+          showField: {
+            path: true,
+            icon: true,
+            notice: true,
+          }
+        },
+        handleCustom({action,data}){
+          console.log(`handleCustom.${action}`, data);
+          if(action === 'number') {
+            XdBus.getParentApi('getOptionsNoticeNumber')()
+              .then(res => {
+                data.cb(res.list)
+              })
+              .catch();
+          }
+        },
+        inline: false,
+        notice: '设置底部菜单的链接地址1、标题(最多<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: true, message: '请添加内容', trigger: 'change'},
+        ],
+      },
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference',
+        groupKey: 'advanced',
+      },
+    ].filter(i=>i);
   },
-  advanced: [],
 };
 

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -23,7 +23,7 @@
           style="height:100%"
           v-if="list !== null"
           :height="height"
-          :tab-bar="list"
+          :tabbar="list"
           :view="view"
           :styles="styles"
           :key="footerBarKey"
@@ -44,8 +44,7 @@
   import {getNoUrl} from "@/utils/nourl";
   import {
     getContainerPropsValue,
-    getComponentAttr,
-    gCPVal
+    getComponentAttr
   } from "@/utils/xd.base";
   import getServiceUrl from "@/common/getServiceUrl";
 
@@ -66,7 +65,6 @@
           backgroundSize: '100% 100%',
           backgroundRepeat: 'no-repeat',
           backgroundPosition: 'top center',
-          backgroundColor: this.backgroundColor,
           '--border-color': this.borderColor
         }
 
@@ -76,46 +74,49 @@
         return params
       }
     },
-    watch: {
-      container(value,oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
-        if (this.$configProject['isPreview']){
-          this.init(value);
-          this.getNumber();
-          this.footerBarKey = this.$xdUniHelper.randomChar(20);
-        }
-      }
-    },
     data() {
       return {
-        closeMask: true,
         height: 0,
         list: null,
         view: false,
         numObj: {},
         footerBarKey: 'footerBarKey', //刷新
         baseUrl: '',
-        footerTpl:'', //模版样式
-
-        //样式
         backgroundImage: '',
-        backgroundColor:'#fff',
-        borderColor: '',
+        borderColor: ''
+      }
+    },
+    watch: {
+      container(value,oloValue) {
+        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+        if (this.$configProject['isPreview']){
+          this.init(value);
+          this.getNumber();
+          this.footerBarKey = this.$xdUniHelper.randomChar(20);
+        }
       }
     },
     created() {
       this.view = this.$configProject.isPreview;
 
+      //非预览模式
       //#ifdef H5
       if (!this.$configProject.isPreview){
         this.baseUrl = this.projectAttr['deploy_dir']
       }
       //#endif
 
-      this.height = Number(getComponentAttr(this.componentAttr, 'height'));
+      //设置高度
+      if(this.$configProject.isPreview) {
+        this.height = getComponentAttr(this.componentAttr, 'height');
+      }
+      else {
+        this.height = getComponentAttr(this.componentAttr, 'height');
+      }
 
-      this.init(this.container);
+      this.height =  Number(this.height);
 
+      this.init(this.container);
       //监听重试消息数量
       this.$xdRoot.$on('restFooterNumber', this.handle)
     },
@@ -195,83 +196,29 @@
 
       /**
        * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
+       * @param value {object} 业务组件对象自己
        */
-      init(container) {
-        this.footerTpl =  gCPVal(container, 'footerTpl', 'noraml');
-
+      init(value) {
         //设置底部菜单
-        let settingKey = 'footer-setting';
-        if(this.footerTpl === 'itemCenterBig') settingKey = 'footer-setting-center-big'
-        let barList = gCPVal(container, settingKey, []);
-        let imageIcons = gCPVal(container, 'footerSettingImage', []);
-
-        this.backgroundImage = gCPVal(container, 'backgroundImage', '',{sKey:'navStatus',fields:['bgColor','backgroundImage','borderColor']});
-        this.backgroundColor = gCPVal(container, 'bgColor', '#fff',{sKey:'navStatus',fields:['bgColor','backgroundImage','borderColor']});
-        this.borderColor = gCPVal(container, 'bgColor', ['#fff','#eee'],{sKey:'navStatus',fields:['bgColor','backgroundImage','borderColor']});
-        let color = gCPVal(container,'color', '');
-        let selectedColor = gCPVal(container,'selectedColor', '');
-        let isShowTitle = gCPVal(container, 'isShowTitle', 'Y');
-        this.iconStyle = gCPVal(container, 'iconStyle', [
-          {
-            cusColor:{
-              iconColor: '#333',
-              color:'#333'
-            },
-            cusActColor:{
-              color: this.mainColor,
-              iconColor: this.mainColor
-            }
-          },
-            {
-            cusColor:{
-              iconColor: color || '#333',
-              color:color || '#333'
-            },
-            cusActColor:{
-              color: selectedColor || this.mainColor,
-              iconColor: selectedColor || this.mainColor
-            }
-          }
-        ],{sKey:'iconStyleStatus',fields:['iconStyle','color','selectedColor']});
-        let borderColor = gCPVal(container, 'centerColor', this.backgroundColor,{sKey:'iconCenterStatus',fields:['centerWidth','centerColor']});
-        let borderWidth = gCPVal(container, 'centerWidth', 12,{sKey:'iconCenterStatus',fields:['centerWidth','centerColor']});
-
-
+        let bar = getContainerPropsValue(value, 'content.footer-setting', []);
+        let imageIcons = getContainerPropsValue(value, 'content.footerSettingImage', []);
+        this.backgroundImage = getContainerPropsValue(value, 'content.backgroundImage', '');
+        this.borderColor = getContainerPropsValue(value, 'content.borderColor', '#eee');
         this.list = {
-          tpl:this.footerTpl,
-          hasName: isShowTitle === 'Y',
-          borderColor,
-          borderWidth,
-          bgColor: this.backgroundColor,
-          color:this.iconStyle.cusColor.color,
-          selectedColor:this.iconStyle.cusActColor.color,
-          iconColor:this.iconStyle.cusColor.iconColor,
-          selectedIconColor:this.iconStyle.cusActColor.iconColor,
-          list: barList.map((item,index)=>{
-            let selfImage = (item.image && item.image.url) ? getServiceUrl(item.image.url,'size3'):'';
-            let selfActImage = (item.actImage && item.actImage.url) ? getServiceUrl(item.actImage.url,'size3'):'';
-            let image = (selfImage || selfActImage) || this.getImage(imageIcons,index,'image') || this.getImage(imageIcons,index,'actImage');
-            let actImage = (selfActImage || selfImage) || this.getImage(imageIcons,index,'actImage') || this.getImage(imageIcons,index,'image');
-            let iconType = 'icon';
-            if(!item['iconType'] && (actImage || image)) iconType = 'image';
-            if(['icon','image'].includes(item['iconType'])) iconType = item['iconType'];
-            let router = {
-              path: (item.path && item.path.value) ? item.path.value :'',
+          bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
+          bodyStyle: this.bodyStyle,
+          selectedColor: getContainerPropsValue(value, 'content.selectedColor', this.mainColor),
+          color: getContainerPropsValue(value, 'content.color', '#333'),
+          list: bar.map((item,index)=>{
+            return {
+              name: item.name.slice(0, 6),
+              icon: item.icon,
+              path: item.path.value,
+              size: item.size,
               num: this.numObj[index] ? this.numObj[index]: 0 ,
+              image: this.getImage(imageIcons,index,'image') || this.getImage(imageIcons,index,'actImage'),
+              actImage: this.getImage(imageIcons,index,'actImage') || this.getImage(imageIcons,index,'image'),
             }
-            if(isShowTitle === 'Y') router['name'] = item.name ? item.name.slice(0, 5): '';
-            if(iconType === 'icon') {
-              router['icon'] = item.icon;
-              router['image'] = '';
-              router['actImage'] = '';
-            }
-            if(iconType === 'image') {
-              router['icon'] = '';
-              router['image'] = image;
-              router['actImage'] = actImage;
-            }
-            return router
           }),
         };
       },
@@ -287,12 +234,12 @@
       border-color: var(--border-color);
     }
   }
-
+  
 
   .jfb-base-footer {
+
     &__body{
       box-sizing: border-box;
-      overflow: inherit!important;
     }
   }
 </style>

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -529,8 +529,20 @@
         const month = String(date.getMonth() + 1);
         return `${year}年${month}月`;
       },
+      convertDateFormat(dateStr) {
+          if(!dateStr)return''
+          // 提取年份和月份
+          const year = dateStr.match(/(\d{4})年/)[1];
+          const month = dateStr.match(/(\d+)月/)[1];
+          
+          // 确保月份是两位数
+          const formattedMonth = month.padStart(2, '0');
+          
+          // 组合成目标格式
+          return `${year}-${formattedMonth}-01`;
+      },
       handleLastMonth() {
-        const dateRange = new Date(this.monthDateRange.replace("年", "-").replace("月", "-01"));
+        const dateRange = new Date(this.convertDateFormat(this.monthDateRange));
         // 获取上一个月的日期范围
         const previousMonth = new Date(dateRange);
         previousMonth.setMonth(dateRange.getMonth() - 1);
@@ -540,7 +552,7 @@
         this.getMonthData()
       },
       handleNextMonth() {
-        const dateRange = new Date(this.monthDateRange.replace("年", "-").replace("月", "-01"));
+        const dateRange = new Date(this.convertDateFormat(this.monthDateRange));
         // 获取下一个月的日期范围
         const nextMonth = new Date(dateRange);
         nextMonth.setMonth(dateRange.getMonth() + 1);

package/src/components/JfbBaseTfkSearch/Api.js

@@ -24,19 +24,4 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'getTfkSearchFilterItems',
-    title: '获取搜索筛选条件',
-    path: '/mall/v1/msearch/search-filter',
-    isRule: false,
-    data: {
-      type: ['类型', 'String', '必选'],
-      namespace: ['业务线', 'Number', '非必选'],
-      city_code: ['城市编码', 'Number', '非必选'],
-      filter_item: ['纬度', 'Number', '非必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
 ];

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -177,10 +177,6 @@ export default {
     tabId:{
       type:String,
       required:true
-    },
-    refresh: {
-      type: String | Number,
-      default: '',
     }
   },
 
@@ -286,12 +282,6 @@ export default {
       this.onCusReloadList();
     },
 
-    refresh() {
-      this.handleClear();
-      this.parseTab()
-      this.onCusReloadList();
-    },
-
     stateCity(n, o){
       if(n && JSON.stringify(n) !== JSON.stringify(o)){
         this.onCusReloadList()