jufubao-base 1.0.290-beta3 → 1.0.290

package/src/components/JfbBaseFooter/cusAttr/content.js

@@ -0,0 +1,475 @@
+'use strict';
+
+import tools from "./tools";
+import ICONS from "@/ICONS";
+import {
+  dataVal,
+  customVal,
+  statusDataVal,
+  statusShow
+} from "@/utils/AttrTools";
+
+export default function (data, gValue, gColor, oldData){
+  const {footerSettingImage, footerSetting} = tools(data);
+
+  let footerTpl = dataVal({data, key:'footerTpl', dValue:'normal', gValue});
+
+
+  let iconStyle = {
+    cusColor:{
+      iconColor: '#333',
+      color: '#333'
+    },
+    cusActColor:{
+      iconColor: gColor.mainColor,
+      color:gColor.mainColor
+    }
+  }
+  if(data.color) {
+    iconStyle['cusColor'] = {
+      iconColor: data.color,
+      color: data.color
+    }
+  }
+  if(data.selectedColor) {
+    iconStyle['cusActColor'] = {
+      iconColor: data.selectedColor,
+      color: data.selectedColor
+    }
+  }
+  if(data.iconStyle !== undefined) iconStyle = data.iconStyle;
+
+
+  return [
+    {
+      label: '',
+      ele: 'slot',
+      slot: 'is_reference_title',
+      groupKey: 'content',
+      labelInline:true,
+    },
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "组件样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "footerTpl",
+      value: dataVal({data, key:'footerTpl', dValue:'normal', gValue}),
+      labelInline:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'lynkWnvoDmMLIdOR1AhSt',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+
+    footerTpl === 'itemCenterBig'&&{ele: 'group_start'},
+    {
+      label: '中间图标',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'iconCenterStatus',
+      value: statusDataVal({data, key:'iconCenterStatus', fields:['centerColor','centerWidth'],gValue}),
+      hidden: !(footerTpl === 'itemCenterBig'),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {
+      label: '边框大小',
+      ele: 'el-input',
+      type: 'number',
+      groupKey: 'content',
+      valueKey: 'centerWidth',
+      cusStyle: {paddingLeft: '80px'},
+      labelInline:true,
+      value: dataVal({data, key:'centerWidth', dValue:12, gValue}),
+      hidden:!(footerTpl === 'itemCenterBig') || !statusShow({data, key: 'iconCenterStatus', fields:['centerColor','centerWidth'], gValue}),
+      className: 'input100',
+    },
+    {
+      label: '边框颜色',
+      ele: 'xd-color',
+      valueKey: 'centerColor',
+      groupKey:'content',
+      labelInline:true,
+      cusStyle: {paddingLeft: '80px'},
+      value: dataVal({data, key:'centerColor', dValue:'', gValue}),
+      hidden:!(footerTpl === 'itemCenterBig') || !statusShow({data, key: 'iconCenterStatus', fields:['centerColor','centerWidth'], gValue}),
+      placeholder: '请选择边框颜色',
+      setting: {
+        showAlpha: true
+      },
+      className: 'input100',
+    },
+    footerTpl === 'itemCenterBig'&& {ele: 'group_end'},
+
+    {
+      label: "菜单名称",
+      ele: "xd-radio",
+      valueKey: "isShowTitle",
+      labelInline:true,
+      value: dataVal({data, key:'isShowTitle', dValue:'Y', gValue}),
+      groupKey:'content',
+      list: [
+        {"label": "显示", "value": "Y"},
+        {"label": "隐藏", "value": "N"},
+      ],
+    },
+
+    {
+      label: '图标配色',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'iconStyleStatus',
+      value: statusDataVal({data, key:'iconStyleStatus', fields:['iconStyle','color','selectedColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey:'content',
+      valueKey: 'iconStyle',
+      value: iconStyle,
+      hidden: !statusShow({data, key: 'iconStyleStatus', fields:['iconStyle','color','selectedColor'], gValue}),
+      labelInline:true,
+      setting: {
+        fontSize: false,
+        weight:false,
+        bgColor: false,
+        selected:true,
+        color: false,
+        cusColor: [
+          {label: '图标色', value: 'iconColor'},
+          {label: '文字色', value: 'color'},
+        ],
+        default:{
+          cusColor:{
+            iconColor: '#333',
+            color: '#333'
+          },
+          cusActColor:{
+            color: gColor.mainColor,
+            iconColor: gColor.mainColor
+          }
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '导航样式',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'navStatus',
+      value: statusDataVal({data, key:'navStatus', fields:['backgroundImage','bgColor','borderColor'], gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '背景色',
+      ele: 'xd-color',
+      valueKey: 'bgColor',
+      groupKey:'content',
+      value: dataVal({data, key:'bgColor', dValue:'', gValue}),
+      hidden:!statusShow({data, key: 'navStatus', fields:['bgColor','backgroundImage','borderColor'], gValue}),
+      labelInline:true,
+      placeholder: '请选择背景颜色',
+      setting: {
+        showAlpha: true
+      },
+      classNmae: 'input800',
+    },
+    {
+      label: '边框色:',
+      ele: 'xd-color',
+      valueKey: 'borderColor',
+      groupKey:'content',
+      value: dataVal({data, key:'borderColor', dValue:'', gValue}),
+      hidden:!statusShow({data, key: 'navStatus', fields:['bgColor','backgroundImage','borderColor'], gValue}),
+      placeholder: '请选择边框颜色',
+      labelInline:true,
+      setting: {
+        showAlpha: true
+      },
+      classNmae: 'input800',
+    },
+    {
+      label: '背景图',
+      labelInline:true,
+      ele: 'xd-upload',
+      valueKey: 'backgroundImage',
+      groupKey:'content',
+      value: dataVal({data, key:'backgroundImage', dValue:{}, gValue}),
+      hidden:!statusShow({data, key: 'navStatus', fields:['bgColor','backgroundImage','borderColor'], gValue}),
+      defaultValue: dataVal({data, key:'backgroundImage', dValue:null, gValue}),
+      slot: true,
+      oneWidth: 260,
+      oneHeight: 260*110/750,
+      elinputClassName: 'input40',
+      tipsformet: '<span style="font-size: 12px; color: #999">上传文件格式：@imageType@，不超过@size@MB。建议尺寸：<span style="color:red">750*110</span>像素</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: .5,
+      action: 'action',
+      sort: true,
+      maxlen: 1,
+    },
+    {ele: 'group_end'},
+    //--弃用-----
+    {
+      label: '菜单图片配置:',
+      ele: 'xd-footer-setting',
+      valueKey: 'footerSettingImage',
+      groupKey:'content',
+      value: footerSettingImage,
+      hidden: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+        hideAdd: true,
+        showField: {
+          path: true,
+          icon: false,
+          notice: false,
+          image: true,
+          actImage: true
+        },
+        disabel:{
+          path: true,
+          icon: true,
+          notice: true,
+          image: true,
+          actImage: true
+        },
+      },
+      handleCustom({action,data}){
+        if(action === 'number') {
+          XdBus.getParentApi('getOptionsNoticeNumber')()
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch();
+        }
+      },
+    },
+    {
+      label: '选中',
+      ele: 'xd-color',
+      valueKey: 'selectedColor',
+      groupKey:'content',
+      labelInline:true,
+      hidden: true,
+      setting: {
+        showAlpha: true
+      },
+      value: dataVal({data, key:'selectedColor', dValue:'', gValue}),
+      placeholder: '请选择菜单文字选中颜色',
+      classNmae: 'input100',
+    },
+    {
+      label: '未选中',
+      ele: 'xd-color',
+      valueKey: 'color',
+      groupKey:'content',
+      value: dataVal({data, key:'color', dValue:'', gValue}),
+      hidden: true,
+      labelInline:true,
+      setting: {
+        showAlpha: true
+      },
+      placeholder: '请选择菜单文字颜色',
+      classNmae: 'input100',
+    },
+    //--弃用-----
+    {
+      ele: 'title',
+      label: '菜单内容',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: '',
+      ele: 'xd-footer-new-setting',
+      valueKey: 'footer-setting',
+      groupKey:'content',
+      value: footerSetting,
+      labelInline:true,
+      hidden: !(dataVal({data, key:'footerTpl', dValue:'normal', gValue}) === 'normal') ,
+      cusStyle: {marginLeft: 0,paddingLeft:0,paddingRight:0},
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+        icons:ICONS,
+        mode: 'new',
+        tplMode: footerTpl,
+        iconColor:{
+          color: data['iconStyleStatus'] === 'D'? '#333': iconStyle.cusColor.iconColor,
+          actColor :  data['iconStyleStatus'] === 'D'?gColor.mainColor: iconStyle.cusActColor.iconColor
+        },
+        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();
+        }
+      },
+      className: 'input100',
+      rules: [
+        {
+          required: false,
+          validator: (rule, value, callback) => {
+            let setTpl = dataVal({data, key:'footerTpl', dValue:'normal', gValue});
+            if(setTpl === 'normal') {
+              if(value && value.length === 0) callback('请设置菜单');
+              else {
+                let errorStr = '';
+                if(value && value.length > 0) {
+                  let len = value.length;
+                  for(let i = 0; i < len; i++) {
+                    if(value[i].name.length > 5) {
+                      errorStr = `菜单${i}最大长度不能超过5个汉字`;
+                      break
+                    }
+                  }
+                }
+                if(errorStr) {
+                  callback(errorStr)
+                }else callback();
+              }
+            }
+            else callback()
+          },
+          trigger: ['blur','change']
+        }
+      ],
+    },
+    {
+      label: '',
+      ele: 'xd-footer-new-setting',
+      valueKey: 'footer-setting-center-big',
+      groupKey:'content',
+      value: dataVal({data, key:'footer-setting-center-big', dValue:[], gValue}),
+      labelInline:true,
+      cusStyle: {marginLeft: 0,paddingLeft:0},
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+        icons:ICONS,
+        mode: 'new',
+        tplMode: footerTpl,
+
+        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();
+        }
+      },
+      hidden: !(dataVal({data, key:'footerTpl', dValue:'normal', gValue}) === 'itemCenterBig'),
+      rules: [
+        {
+          required: false,
+          validator: (rule, value, callback) => {
+            let setTpl = dataVal({data, key:'footerTpl', dValue:'normal', gValue});
+            if(setTpl === 'itemCenterBig') {
+              if(value && value.length === 0) callback('请设置菜单');
+              else {
+                let errorStr = '';
+                if(value && value.length > 0) {
+                  let len = value.length;
+                  for(let i = 0; i < len; i++) {
+                    if(value[i].name.length > 5) {
+                      errorStr = `菜单${i}最大长度不能超过5个汉字`;
+                      break
+                    }
+                  }
+                }
+                if(errorStr) {
+                  callback(errorStr)
+                }else callback();
+              }
+            }
+            else callback()
+          },
+          trigger: 'blur'
+        }
+      ],
+      className: 'input100',
+    },
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
+    {
+      label: '引用过滤字段设置:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'refFilterContent',
+      value: '[]',
+      hidden: true,
+    },
+    {
+      label: '',
+      ele: 'slot',
+      slot: 'is_reference',
+      groupKey: 'content',
+    },
+  ].filter(i=>i)
+}

package/src/components/JfbBaseFooter/cusAttr/style.js

@@ -0,0 +1,7 @@
+'use strict';
+
+export default function (data, gValue,gColor,oldData){
+  return [
+  ].filter(i=>i)
+}
+

package/src/components/JfbBaseFooter/cusAttr/tools.js

@@ -0,0 +1,17 @@
+'use strict';
+
+export default (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 {footerSettingImage, footerSetting}
+}

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -513,7 +513,7 @@
       },
       getYearAndMonth(dateStr) {
         // 将输入的日期字符串转换为Date对象
-        const date = new Date(this.convertDateFormat(dateStr));
+        const date = new Date(dateStr.replace("年", "-").replace("月", "-01"));
 
         // 获取年份和月份
         const year = date.getFullYear();
@@ -529,20 +529,8 @@
         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.convertDateFormat(this.monthDateRange));
+        const dateRange = new Date(this.monthDateRange.replace("年", "-").replace("月", "-01"));
         // 获取上一个月的日期范围
         const previousMonth = new Date(dateRange);
         previousMonth.setMonth(dateRange.getMonth() - 1);
@@ -552,7 +540,7 @@
         this.getMonthData()
       },
       handleNextMonth() {
-        const dateRange = new Date(this.convertDateFormat(this.monthDateRange));
+        const dateRange = new Date(this.monthDateRange.replace("年", "-").replace("月", "-01"));
         // 获取下一个月的日期范围
         const nextMonth = new Date(dateRange);
         nextMonth.setMonth(dateRange.getMonth() + 1);

package/src/components/JfbBaseTfkSearch/Api.js

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