jufubao-base 1.0.129 → 1.0.130-beta2

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less

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

package/src/components/JfbBaseSearch/Attr.js

@@ -1,154 +1,12 @@
 'use strict';
 
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
 export default {
   style: [],
-  advanced: [],
-  content: [
-    //文本信息
-    {
-      label: '标题名称:', //label
-      ele: 'el-input', //package 名称
-      type: 'text',
-      valueKey: 'title', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入标题名称',
-      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
-      rules: [
-        {
-          required: true,
-          type: 'url',
-          message: '请输入域名地址',
-          trigger: 'blur'
-        },
-      ]
-    },
+  content: [],
+  advanced: [
 
-    //远程获取内容选择
-    {
-      label: '跳转路径:', //label
-      ele: 'xd-select-list', //package 名称
-      valueKey: 'jumpToLink', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请选择加盟商',
-      multiple: false, //多选
-      collapseTags: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-    },
-
-    //本地固定内容选择
-    {
-      label: '选择内容:', //label
-      ele: 'xd-select-list', //package 名称
-      valueKey: 'select', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请选择选择内容',
-      multiple: false, //多选
-      remote: false,
-      list: [
-        {"label": "订单详情", "value": '/main/order/order'},
-        {"label": "购物车详情", "value": '/main/cart/cart'},
-        {"label": "商品详情", "value": '/main/product/product'},
-        {"label": "商品分类", "value": '/main/producttype/producttype'},
-      ],
-    },
-
-    //本地固定单选选择
-    {
-      label: '单选列表（固定）:', //label
-      ele: 'xd-radio', //package 名称
-      valueKey: 'radio_status_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-      list: [
-        {"label": "万利达集团", "value": 4},
-        {"label": "中国联通", "value": 5},
-        {"label": "中国移动", "value": 6},
-        {"label": "味多美", "value": 7},
-      ]
-    },
-
-    //远程固定单选选择
-    {
-      label: '单选列表（固定）:', //label
-      ele: 'xd-radio', //package 名称
-      valueKey: 'radio_status_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-    },
-
-    //本地固定多选选择
-    {
-      label: '多选列表（固定）:', //label
-      ele: 'xd-check', //package 名称
-      valueKey: 'xd-check_list', //form[valueKey]
-      value: 6, //v-model
-      disabled: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-      list: [
-        {"label": "万利达集团", "value": 4},
-        {"label": "中国联通", "value": 5},
-        {"label": "中国移动", "value": 6},
-        {"label": "味多美", "value": 7},
-      ]
-    },
-
-    //远程多选选选择
-    {
-      label: '多选列表:', //label
-      ele: 'xd-check', //package 名称
-      valueKey: 'xd-check_remote-list', //form[valueKey]
-      value: 6, //v-model
-      disabled: false,
-      remoteApi: '/api/editx/pages',
-      remote: true,
-      rules: [
-        {required: true, message: '请选择', trigger: ['blur', 'change']}
-      ],
-    },
-
-    //状态(二选一)单选选择
-    {
-      label: '状态(二选一):', //label
-      ele: 'xd-radio-status', //package 名称
-      valueKey: 'radio_status', //form[valueKey]
-      value: 'Y', //v-model
-      isall: true,
-      disabled: true,
-      backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
-      placeholder: '请选择',
-      list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
-    },
-
-    //文本信息
-    {
-      label: '标题名称:', //label
-      ele: 'el-input', //package 名称
-      type: 'text',
-      valueKey: 'title', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入标题名称',
-      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
-      rules: [
-        {
-          required: true,
-          type: 'url',
-          message: '请输入域名地址',
-          trigger: 'blur'
-        },
-      ]
-    },
   ],
-}
+};

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -41,10 +41,7 @@
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {
-      return {
-
-        //todo
-      }
+      return {}
     },
     watch: {
       container(value) {
@@ -53,53 +50,27 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
+      // this.$xdAlert({
+      //   content:'此组件已弃用，请勿使用',
+      //   time:4000,
+      //   type:'error'
+      // })
     },
     methods: {
       onJfbLoad(options) {
-        console.log(this.layoutInfo, 'layoutInfolayoutInfolayoutInfo')
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(value) {
-
-        //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
+      init(container) {
 
-        //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
       handleSelect(select) {
-        console.log(select,'6666666')
         this.$xdRoot.$emit('onUserLocation', select);
         this.$xdUniHelper.navigateBack()
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        this.$xdUniHelper.navigateBack()
-        console.log('event.onJfbBack', options)
-      },
+
     }
   }
 

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less

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

package/src/components/JfbBaseSetPwd/Attr.js

@@ -1,150 +1,9 @@
 'use strict';
 
-export default [
-  //文本信息
-  {
-    label: '标题名称:', //label
-    ele: 'el-input', //package 名称
-    type: 'text',
-    valueKey: 'title', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请输入标题名称',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        type: 'url',
-        message: '请输入域名地址',
-        trigger: 'blur'
-      },
-    ]
-  },
+export default {
+  style: [],
+  advanced: [],
+  content: [
 
-  //远程获取内容选择
-  {
-    label: '跳转路径:', //label
-    ele: 'xd-select-list', //package 名称
-    valueKey: 'jumpToLink', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请选择加盟商',
-    multiple: false, //多选
-    collapseTags: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-  },
-
-  //本地固定内容选择
-  {
-    label: '选择内容:', //label
-    ele: 'xd-select-list', //package 名称
-    valueKey: 'select', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请选择选择内容',
-    multiple: false, //多选
-    remote: false,
-    list: [
-      {"label": "订单详情", "value": '/main/order/order'},
-      {"label": "购物车详情", "value": '/main/cart/cart'},
-      {"label": "商品详情", "value": '/main/product/product'},
-      {"label": "商品分类", "value": '/main/producttype/producttype'},
-    ],
-  },
-
-  //本地固定单选选择
-  {
-    label: '单选列表（固定）:', //label
-    ele: 'xd-radio', //package 名称
-    valueKey: 'radio_status_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-    list: [
-      {"label": "万利达集团", "value": 4},
-      {"label": "中国联通", "value": 5},
-      {"label": "中国移动", "value": 6},
-      {"label": "味多美", "value": 7},
-    ]
-  },
-
-  //远程固定单选选择
-  {
-    label: '单选列表（固定）:', //label
-    ele: 'xd-radio', //package 名称
-    valueKey: 'radio_status_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-  },
-
-  //本地固定多选选择
-  {
-    label: '多选列表（固定）:', //label
-    ele: 'xd-check', //package 名称
-    valueKey: 'xd-check_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-    list: [
-      {"label": "万利达集团", "value": 4},
-      {"label": "中国联通", "value": 5},
-      {"label": "中国移动", "value": 6},
-      {"label": "味多美", "value": 7},
-    ]
-  },
-
-  //远程多选选选择
-  {
-    label: '多选列表:', //label
-    ele: 'xd-check', //package 名称
-    valueKey: 'xd-check_remote-list', //form[valueKey]
-    value: 6, //v-model
-    disabled: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-  },
-
-  //状态(二选一)单选选择
-  {
-    label: '状态(二选一):', //label
-    ele: 'xd-radio-status', //package 名称
-    valueKey: 'radio_status', //form[valueKey]
-    value: 'Y', //v-model
-    isall: true,
-    disabled: true,
-    backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
-    placeholder: '请选择',
-    list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
-  },
-
-  //文本信息
-  {
-    label: '标题名称:', //label
-    ele: 'el-input', //package 名称
-    type: 'text',
-    valueKey: 'title', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请输入标题名称',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        type: 'url',
-        message: '请输入域名地址',
-        trigger: 'blur'
-      },
-    ]
-  },
-]
+  ],
+}

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdLess.less

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