jufubao-base 1.0.134-beta8 → 1.0.134

package/src/components/JfbBaseLine/JfbBaseLine.vue

@@ -0,0 +1,105 @@
+<template>
+  <view
+    class="jfb-base-line"
+    @click="handleEditxSelect"
+    :class="{
+      editx : isEditx && active,
+      noBorder: noBorder
+    }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-line__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active && !noBorder"
+    >
+      <view class="jfb-base-line__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-line__body">
+      <view
+        :style="{
+          height: height * 2 + 'rpx',
+          background: bgcolor,
+          marginTop: topMargin * 2 + 'rpx',
+          marginBottom: bottomMargin * 2 + 'rpx',
+          marginLeft: leftMargin * 2 + 'rpx',
+          marginRight: rightMargin * 2 + 'rpx',
+        }"
+      ></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import JfbBaseLineMixin from "./JfbBaseLineMixin";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins"
+  import {getContainerPropsValue} from "@/utils/xd.base";
+  
+  export default {
+    name: "JfbBaseLine",
+    components: {
+      XdFontIcon
+    },
+    mixins: [componentsMixins,extsMixins,JfbBaseLineMixin],
+    data() {
+      return {
+        height: 1, //px
+        bgcolor: '#ececec',
+        topMargin: 2, //px
+        bottomMargin: 2,//px
+        leftMargin: 0, //px
+        rightMargin: 0 //px
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      init(value) {
+        let bgcolor = getContainerPropsValue(value, 'content.bgcolor');
+        let height = getContainerPropsValue(value, 'content.height');
+        let margin = getContainerPropsValue(value, 'content.margin');
+        if (bgcolor) this.bgcolor = bgcolor;
+        if (height) this.height = height;
+        
+        if(margin) {
+          this.topMargin = margin.top;
+          this.bottomMargin = margin.bottom;
+          this.rightMargin = margin.right;
+          this.leftMargin = margin.left;
+        }
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseLineLess.less";
+
+  .jfb-base-line {
+
+
+    &__body{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      & > view {
+        overflow: hidden;
+        display: flex;
+        flex-flow: wrap;
+        width: 100%;
+        box-sizing: border-box;
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseLine/JfbBaseLineLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-line {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(50, rpx);
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-line {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseLine/JfbBaseLineMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-line'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseLogin/Api.js

@@ -128,7 +128,7 @@ module.exports = [
     isRule: false,
     params: {
       third_auth_code: ['第三方code', 'String', '必选'],
-      provider_id: ['登录提供者id', 'String', '必选']
+      provider_id: ['登陆提供者id', 'String', '必选']
     }
   },
   {

package/src/components/JfbBaseLogin/Attr.js

@@ -4,12 +4,97 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: 'LOGO文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'logoTextColor',
+      value: '',
+      placeholder: '请输入LOGO文字颜色',
+      classNmae: 'input80',
+    },
+    {
+      label: '是否使用体验码功能:',
+      ele: 'xd-radio',
+      valueKey: 'isPreview',
+      value: 'N',
+      placeholder: '请选择是否使用体验码功能',
+      multiple: false,
+      className: 'input80',
+      list: [
+        {label: '是', value: 'Y'},
+        {label: '否', value: 'N'},
+      ]
+    },
+    {
+      ele: 'title',
+      label: '页面连接设置',
+      size: 'small',
+    },
+    {
+      label: '快速授权失败访问地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'error_url', //form[valueKey]
+      placeholder: '请选择快速授权失败访问地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '登录成功跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'callback_url', //form[valueKey]
+      placeholder: '请选择登录成功跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '手机号登录地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_login_url', //form[valueKey]
+      placeholder: '请选择手机号登录地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '收集手机号地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_collect_url', //form[valueKey]
+      placeholder: '请选择收集手机号地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '忘记密码跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'forget_pwd_url', //form[valueKey]
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      ele: 'title',
+      label: '服务设置',
+      size: 'small',
+    },
     {
       label: '隐私政策:',
       ele: 'xd-site-news',
       valueKey: 'notice',
       value: {type: 'privacy'},
-      groupKey:'content',
       className: 'input70',
       setting: {
         type: 'privacy',
@@ -30,8 +115,7 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        //获取返回参数(场景类型名称为必填)
-        let loading = { close(){}}
+        let loading = XdBus.getParentApi('loading')({});
 
         //获取显示内容
         if (action === 'screen') {
@@ -75,7 +159,6 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -90,7 +173,6 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -104,7 +186,6 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -119,7 +200,6 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -134,7 +214,6 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -149,7 +228,6 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -163,7 +241,6 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -178,7 +255,6 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -193,7 +269,6 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -208,7 +283,6 @@ export default {
 
         //内容发布
         if (action === 'publish') {
-          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -223,7 +297,6 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -235,7 +308,6 @@ export default {
       label: '用户服务协议:',
       ele: 'xd-site-news',
       valueKey: 'notices',
-      groupKey:'content',
       value: {type: 'privacy'},
       className: 'input70',
       setting: {
@@ -256,7 +328,7 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = { close(){}}
+        let loading = XdBus.getParentApi('loading')({});
 
         //获取显示内容
         if (action === 'screen') {
@@ -300,7 +372,6 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -315,7 +386,6 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -329,7 +399,6 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -344,7 +413,6 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -359,7 +427,6 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -374,7 +441,6 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -388,7 +454,6 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -403,7 +468,6 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -418,7 +482,6 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -433,7 +496,6 @@ export default {
 
         //内容发布
         if (action === 'publish') {
-          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -448,7 +510,6 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
-          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -456,89 +517,5 @@ export default {
       inline: false,
       notice: '',
     },
-    {
-      label: '是否使用体验码功能:',
-      ele: 'xd-radio',
-      valueKey: 'isPreview',
-      groupKey:'content',
-      value: 'N',
-      placeholder: '请选择是否使用体验码功能',
-      multiple: false,
-      className: 'input80',
-      list: [
-        {label: '是', value: 'Y'},
-        {label: '否', value: 'N'},
-      ]
-    },
-    {
-      label: '站点名称颜色:',
-      ele: 'xd-color',
-      valueKey: 'logoTextColor',
-      groupKey:'style',
-      value: '',
-      placeholder: '请选择站点名称颜色',
-      classNmae: 'input60',
-    },
-    {
-      label: '快速授权失败访问地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'error_url', //form[valueKey]
-      groupKey:'advanced',
-      placeholder: '请选择快速授权失败访问地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '登录成功跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'callback_url', //form[valueKey]
-      groupKey:'advanced',
-      placeholder: '请选择登录成功跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '手机号登录地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'phone_number_login_url', //form[valueKey]
-      groupKey:'advanced',
-      placeholder: '请选择手机号登录地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '收集手机号地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'phone_number_collect_url', //form[valueKey]
-      groupKey:'advanced',
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '忘记密码跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'forget_pwd_url', //form[valueKey]
-      groupKey:'advanced',
-      placeholder: '请选择跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-
   ]
 }

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -417,7 +417,7 @@ export default {
     },
 
     /**
-     * @description 获取到登录方式之后处理
+     * @description 获取到登陆方式之后处理
      */
     handleAuthResult(res) {
       if (res.quick_enabled) {
@@ -438,7 +438,7 @@ export default {
     },
 
     /**
-     * @description 微信获取登录方式
+     * @description 微信获取登陆方式
      */
     authWxMpListProviders() {
       let providers = this.projectAttr["login_providers"] || [
@@ -492,7 +492,7 @@ export default {
                   url: `/system/login/wxauthorize?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&url=${url}`,
                 });
               }
-              //无需授权直接进行登录
+              //无需授权直接进行登陆
               else {
                 if (this.jfbAuthorize !== null) {
                   this.jfbAuthorize.setAllToken(res["login_info"], () => {
@@ -515,7 +515,7 @@ export default {
     },
 
     /**
-     * @description h5获取登录方式
+     * @description h5获取登陆方式
      */
     authH5ListProviders() {
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading.')
@@ -736,6 +736,7 @@ export default {
 @import "./JfbBaseLoginLess.less";
 
 .jfb-base-login {
+  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
 
   &__body {