jufubao-base 1.0.310 → 1.0.311-beta101

package/package.json

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

package/src/components/JfbBaseBlock/Attr.js

@@ -1,43 +1,176 @@
 'use strict';
 
+import {dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
+
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 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',
-    },
-    {
-      label: '高度:',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'height',
-      groupKey:'style',
-      value: null,
-      classNmae: 'input60',
-      inline: false,
-      notice:'占位框高度，单位像素，默认：<span style="color:red">20</span>像素'
-    },
-    {
-      label: '',
-      ele: 'slot',
-      slot: 'is_reference',
-      groupKey:'advanced',
-    },
-  ],
+  content:(data, gValue, gColor, oldData)=>{
+    return  [
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey:'advanced',
+      },
+      {
+        ele: 'title',
+        label: '基础',
+        size: 'small',
+        groupKey:'content',
+      },
+      {
+        label: '外边距',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'marginStatus',
+        value: statusDataVal({data, key:'marginStatus', fields:['margin'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-margin-padding',
+        groupKey:'content',
+        valueKey: 'margin',
+        value: dataVal({
+          data,
+          key:'margin',
+          dValue:0,
+          gValue,
+          isPM: true,
+        }),
+        hidden: !statusShow({data, key: 'marginStatus', fields:['margin'], gValue}),
+        setting: {
+          type: 'margin',
+        },
+      },
+      {ele: 'group_end'},
+      {
+        label: '背景颜色',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'bgcolorStatus',
+        value: statusDataVal({data, key:'bgcolorStatus', fields:['bgcolor'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-color',
+        valueKey: 'bgcolor',
+        value: dataVal({data, key:'bgcolor', dValue:'', gValue}),
+        hidden: !statusShow({data, key: 'bgcolorStatus', fields:['bgcolor'], gValue}),
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80',
+        groupKey: 'content',
+        labelInline: true,
+        setting: {
+          showAlpha: true
+        }
+      },
+      {ele: 'group_end'},
+      {
+        label: '高度',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'heightStatus',
+        value: statusDataVal({data, key:'heightStatus', fields:['height'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'height',
+        groupKey:'content',
+        value: dataVal({data, key:'height', dValue:'', gValue}), //默认0
+        hidden: !statusShow({data, key: 'heightStatus', fields:['height'], gValue}),
+        classNmae: 'input100',
+      },
+      {ele: 'group_end'},
+      {
+        label: '圆角',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'radiusStatus',
+        value: statusDataVal({data, key:'radiusStatus',cValue: 'N', fields:['radius'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '无圆角', value: 'N'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-site-select-list',
+        labelInline: true,
+        valueKey: 'radius',
+        value: dataVal({data, key:'radius', dValue:'10', gValue}),
+        hidden: !statusShow({data, key: 'radiusStatus', fields:['radius'], gValue}),
+        placeholder: '请选择圆角',
+        multiple: false,
+        className: 'input80',
+        groupKey:'content',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              res.list = res.list.filter(item=>{
+                return item.label !== '无';
+              });
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {ele: 'group_end'},
+      {
+        label: '版本号:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'version',
+        value: 'v2.0',
+        hidden: true,
+      },
+      {
+        label: '过滤引用模版字段:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'refFilterKey',
+        value: '[]',
+        hidden: true,
+      },
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference',
+        groupKey:'advanced',
+      },
+    ]
+  },
   advanced: [],
 };

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -17,7 +17,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-block__body">
-      <view :style="{height: height + 'rpx', background: bgcolor}"></view>
+      <view :style="[contentStyle]"></view>
     </view>
   </view>
 </template>
@@ -28,7 +28,7 @@
   import JfbBaseBlockMixin from "./JfbBaseBlockMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
-  import {getContainerPropsValue} from "@/utils/xd.base";
+  import {getContainerPropsValue, gCPVal} from "@/utils/xd.base";
 
   export default {
     name: "JfbBaseBlock",
@@ -38,8 +38,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseBlockMixin],
     data() {
       return {
-        height: 10,
-        bgcolor: '#fff'
+        contentStyle:{},
       }
     },
     watch: {
@@ -52,11 +51,15 @@
       this.init(this.container);
     },
     methods: {
-      init(value) {
-        let bgcolor = getContainerPropsValue(value, 'content.bgcolor', 'rgba(0,0,0,0)');
-        let height = getContainerPropsValue(value, 'content.height', 20);
-        if (bgcolor) this.bgcolor = bgcolor;
-        if (height) this.height = height;
+      init(container) {
+        let radius = gCPVal(container, 'radius', [this.gStyleValue.radius,0],{sKey: 'radiusStatus', fields: ['radius']})||0;
+        let margin = gCPVal(container, 'margin', [0],{sKey: 'marginStatus', fields: ['margin'], isPMR: true});
+        this.contentStyle = {
+          backgroundColor: gCPVal(container, 'bgcolor', '',{sKey: 'bgcolorStatus', fields: ['bgcolor']}),
+          height: gCPVal(container, 'height', '20',{sKey: 'heightStatus', fields: ['height']}) + 'rpx',
+          borderRadius: radius + 'rpx',
+          margin: this.getMarginAndPadding(margin, 0)
+        };
       },
     }
   }

package/src/components/JfbBaseEntry/Attr.js

@@ -1,83 +1,16 @@
 'use strict';
+import content from "./cusAttr/content";
+import style from "./cusAttr/style";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
+  content: (data, gValue, gColor, oldData={}) => {
     return [
-      {
-        label: '选择综合入口类型:',
-        ele: 'xd-site-select-list',
-        valueKey: 'entryType',
-        value: data['entryType'],
-        placeholder: '请选择综合入口类型',
-        multiple: false,
-        groupKey:'content',
-        className: 'input50',
-        rules: [
-          {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
-        ],
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: '每行显示数量',
-        ele: 'xd-radio',
-        valueKey: 'rowNum',
-        groupKey: 'content',
-        value: data.rowNum || 1,
-        rules: [
-          {required: true, message: '请选择', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "一行一列", "value": 1},
-          {"label": "一行二列", "value": 2},
-          {"label": "一行三列", "value": 3},
-        ]
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        groupKey: 'style',
-        placeholder: '请输入背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '间隔边距',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: "paddingInput",
-        groupKey: 'style',
-        value: data.paddingInput || '',
-        placeholder: '请输入间隔边距',
-        inline: false,
-        className:'input60',
-        notice: '设置间隔边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
-      {
-        label: '边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        groupKey:'style',
-        value: data.margin || null,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置边距设置',
-        inline: false,
-        notice: '设置边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
-      },
+      ...content(data, gValue, gColor, oldData),
+      ...style(data, gValue, gColor, oldData),
     ].filter(i=>i)
   },
   advanced: [