jufubao-base 1.0.15 → 1.0.17

package/commands.js

@@ -1,21 +1,45 @@
 'use strict';
 
 const path = require('path');
+const basePath = require('./build/path');
 const clog = require('./build/clog');
 const fileHelper = require('./build/fileHepler');
-const fromBuildPath = path.resolve('./node_modules/gxd-uni-commands/build');
+let fromBuildPath = path.resolve('./node_modules/gxd-commands-bussiness/build');
 const toBuildPath = path.resolve('./build');
-const fromCommandsPath = path.resolve('./node_modules/gxd-uni-commands/commands');
+let fromCommandsPath = path.resolve('./node_modules/gxd-commands-bussiness/commands');
 const toCommandsPath = path.resolve('./commands');
 const utils = require('./build/lib/utils');
+const execSync = require('child_process').execSync;
+const getPackage = `${basePath.buildRoot}/get.package.path.js`;
+
 
 const init = ()=>{
+
+  //判断是否从本地获取数据
+  let isLocal = process.env.isLocal === 'true';
+  if(isLocal && fileHelper.existFileSync(getPackage)) {
+    const {getPackagePath} = require(getPackage);
+    fromBuildPath = fileHelper.getPlatformSurePath(getPackagePath('/build', 'gxd-commands-bussiness'));
+    fromCommandsPath = fileHelper.getPlatformSurePath(getPackagePath('/commands', 'gxd-commands-bussiness'));
+  }
+
   utils.logsLine(clog, 'start');
+
+  //更新包
+  execSync(`npm i --registry=https://registry.npm.taobao.org`, {stdio: 'inherit'});
+
+  //复制命令行
   fileHelper.copySync(fromBuildPath, toBuildPath);
   fileHelper.copySync(fromCommandsPath, toCommandsPath);
   clog(`拷贝命令行操作成功，目录:${toBuildPath}`, 'green');
   clog(`拷贝命令行操作成功，目录:${toCommandsPath}`, 'green');
   utils.logsLine(clog);
+
+  //复制插件库文件
+  clog(`拷贝框架资源`, 'cyanBG');
+  utils.logsLine(clog);
+  execSync(`node ./build/commands/copy.init.js`, {stdio: 'inherit'});
+  utils.logsLine(clog);
 };
 
 init();

package/get.package.path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/get.package.path.js.tpl

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

@@ -1,29 +1,27 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
   "scripts": {
-    "serve": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry && npm run dev:h5",
-    "test": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry && npm run dev:h5",
-    "dev": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry &&  npm run dev:h5",
-    "build": "cross-env type=build cross-env NODE_ENV=production UNI_PLATFORM=h5 npm run init.entry  && npm run build:h5",
+    "serve": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry",
+    "test": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry",
+    "dev": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry",
+    "build": "cross-env type=build cross-env NODE_ENV=production UNI_PLATFORM=h5 npm run init.entry",
+    "init.entry": "node ./build/commands/entry.init.js",
     "update": "node ./commands/update.pack.js",
     "create": "node ./commands/create.pack.js",
-    "commands": "npm i && node ./commands.js",
     "release": "node ./commands/npmignore && npm publish",
-    "upload.bus.static": "node ./build/commands/upload.business.static.js",
-    "init.entry": "node ./build/commands/entry.init.js",
-    "init": "node ./build/commands/copy.init.js",
+    "init": "cross-env isLocal=false node ./commands.js",
+    "init.local": "cross-env isLocal=true node ./commands.js",
+    "coder": "node ./build/commands/coder.js",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build  --minimize",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
-    "init.commands": "cp -rf ./node_modules/gxd-uni-commands/build ./",
-    "init.editx": "node ./build/commands/editx.init.js",
     "copy": "cross-env isOpenDir=true node build/commands/copy.js",
     "oss": "cross-env bucket=xxx region=oss-cn-beijing name=基础项目 node ./build/commands/oss.js",
     "oss.dev": "cross-env bucket=dev-xxx region=oss-cn-qingdao name=基础项目 node ./build/commands/oss.js",
@@ -48,10 +46,11 @@
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
-    "gxd-uni-commands": "1.0.29",
-    "gxd-uni-library": "1.0.39",
+    "gxd-commands-bussiness": "^1.0.6",
+    "gxd-uni-library": "1.0.40",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
+    "path-to-regexp": "^6.2.1",
     "qs": "^6.9.6",
     "regenerator-runtime": "^0.12.1",
     "vue": "^2.6.10",

package/src/common/authorize.js

@@ -0,0 +1,155 @@
+'use strict';
+
+//#ifdef H5
+import cookie from "@/common/cookie";
+//#endif
+import storage from "@/common/storage";
+const settings = require('./../../settings');
+import Vue from 'vue';
+let __jfbAuthorize = null;
+
+class JfbAuthorize {
+  /**
+   * @description 构造函数
+   * @param options {Object}
+   * @param options.siteId  {String} 网站ID 【必填】
+   * @param options.xSite  {String} 网站XID 【必填】
+   * @param options.cardPath {String} 购物登录地址 【选填】
+   * @param options.LoginPath  {String} 用户登录地址 【选填】
+   */
+  constructor(options){
+    this.siteId = options.siteId;
+    this.xSite = options.xSite;
+    this.cardPath = options.cardPath || '/pages/card/card';
+    this.LoginPath = options.LoginPath || '/pages/login/login';
+
+    this.config = Object.assign({},{
+      'user': 'JFB-CSRF-TOKEN-{siteID}',
+      'card': 'JFB-CARD-TOKEN-{siteID}',
+      'refresh': 'JFB-REFRESH-TOKEN-{siteID}',
+      'access': 'JFB-ACCESS-TOKEN',
+    }, settings.token? settings.token: {});
+  }
+
+
+
+  /**
+   * @description 获取token键值
+   * @param key {String} {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user，【选填】
+   * @returns {string|*}
+   */
+  getTokenKeyword(key){
+    if (!this.config[key]) key = 'user';
+    if(key === 'access') return this.config.access;
+    else{
+      return `${this.config[key].replace("{siteID}", this.siteId)}`;
+    }
+  }
+
+  /**
+   * @description 获取request中token键值
+   * @param key {String} {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user，【选填】
+   * @returns {string|*}
+   */
+  getRequestTokenKey(key) {
+    if (!this.config[key]) key = 'user';
+    if (key === 'access') return this.config.access;
+    else {
+      return `${this.config[key].replace("-{siteID}", '')}`;
+    }
+  }
+
+  /**
+   * @description 设置token
+   * @param key {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user，【选填】
+   * @param value {*} 设置cookie/storage的值 【必填】
+   * @param options {Object} 可选项，{expires: 1, domain: ''},  【选填】
+   * @param options.expires {Number} 过期时间单位：小时
+   * @param options.domain {String} 生效域名
+   */
+  setToken(key, value, options = {}) {
+    key = this.getTokenKeyword(key);
+
+    //#ifdef H5
+    cookie.set(key, value, options);
+    //#endif
+    storage.set(key, value, options.expires ? options.expires : 0)
+  }
+
+  /**
+   * @description 删除操作token
+   * @param key {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user
+   * @param options {Object} 可选项，{expires: 1, domain: ''}, 过期时间单位：小时
+   */
+  removeToken(key, options = {}) {
+    //#ifdef H5
+    cookie.remove(key, options);
+    //#endif
+    storage.remove(key);
+  }
+
+  /**
+   * @description 获取token信息
+   * @param key {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user
+   * @param options {Object} 可选项，{expires: 1, domain: ''},  【选填】
+   * @param options.expires {Number} 过期时间单位：小时
+   * @param options.domain {String} 生效域名
+   * @return {null|String}
+   */
+  getToken(key, options = {}) {
+    let tokenKey = this.getTokenKeyword(key);
+    console.log(tokenKey)
+    let token = null;
+    if (storage.get(tokenKey)) token = storage.get(tokenKey);
+    //#ifdef H5
+    if (cookie.get(tokenKey, options)) token = cookie.get(tokenKey, options)
+    //#endif
+    return token
+  }
+
+  /**
+   * @description 用户是否已登录卡信息
+   * @param canCard {Boolean} 检查是否用登录购物车信息 默认：false
+   * @param $vm {Vue}
+   */
+  checkCardLogin(canCard = false, $vm){
+    if(!canCard) return true;
+    if (!this.getToken('card')) {
+      $vm['$xdUniHelper'].redirectTo({
+        url: this.cardPath,
+      });
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * @description 用户已登录信息
+   * @param canSign {Boolean} 检查是否用登录信息 默认：false
+   * @param $vm {Vue}
+   */
+  checkUserLogin(canSign, $vm) {
+    if (!canSign) return true;
+    if (!this.getToken('user')) {
+      $vm['$xdUniHelper'].redirectTo({
+        url: '/pages/login/login',
+      });
+      return false;
+    }
+    return true;
+  }
+}
+
+/**
+ * @description 单利初始化用户授权函数
+ * @param options {Object}
+ * @param options.siteId  {String} 网站ID 【必填】
+ * @param options.cardPath {String} 购物登录地址 【选填】
+ * @param options.LoginPath  {String} 用户登录地址 【选填】
+ */
+export default function (options) {
+  if(__jfbAuthorize !== null) return __jfbAuthorize;
+  return __jfbAuthorize = new JfbAuthorize(options);
+}
+
+

package/src/components/JfbBaseBlock/Attr.js

@@ -6,7 +6,7 @@ export default {
   content: [
     {
       label: '背景颜色:', //label
-      ele: 'xd-board-color', //package 名称
+      ele: 'xd-color', //package 名称
       valueKey: 'bgcolor', //form[valueKey]
       value: '', //v-model
       placeholder: '请输入占位框背景颜色',
@@ -19,6 +19,16 @@ export default {
         },
       ]
     },
+    {
+      label: '选中路径:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'select-pages-path', //form[valueKey]
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree')
+      },
+      inline: false,
+    },
     {
       label: '高度:', //label
       ele: 'el-input', //package 名称

package/src/components/JfbBaseBlock/JfbBaseBlockMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -41,7 +41,8 @@
         *目前仅支持电影票兑换券进行转换
       </view>
       <view class="jfb-base-card__body-card">
-        <view v-for="(item,index) in cardList" :key="index" @click="handleBindLogin(item)" class="jfb-base-card__body-card-item">
+        <view v-for="(item,index) in cardList" :key="index" @click="handleBindLogin(item)"
+              class="jfb-base-card__body-card-item">
           <view class="jfb-base-card__body-card-item-left">
             <xd-font-icon size="55" icon="iconyouhuiquan"></xd-font-icon>
             <view>{{tabIndex===1?'登录':'转换'}}</view>
@@ -63,45 +64,23 @@
             </view>
             <view class="jfb-base-card__body-card-item-right-bottom">
               <view class="jfb-base-card__body-card-item-right-bottom-info">
-                <view v-if="1" class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余点数：{{item.card_point}}</view>
-                <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{item.other_card_point}}</view>
+                <view v-if="1" class="jfb-base-card__body-card-item-right-bottom-info-residue">
+                  剩余点数：{{item.card_point}}
+                </view>
+                <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">
+                  购买其他物品可抵：{{item.other_card_point}}
+                </view>
               </view>
               <view @click.stop="toDetail(item)" :style="{background:$mainColor}">查看</view>
             </view>
           </view>
         </view>
       </view>
-<!--      <view class="jfb-base&#45;&#45;card__body-card" v-else>-->
-<!--        <view v-for="(item,index) in 3" :key="index" class="jfb-base&#45;&#45;card__body-card-item">-->
-<!--          <view class="jfb-base&#45;&#45;card__body-card-item-left">-->
-<!--            <xd-font-icon size="55" icon="iconyouhuiquan"></xd-font-icon>-->
-<!--            <view>转换</view>-->
-<!--          </view>-->
-<!--          <view class="jfb-base&#45;&#45;card__body-card-item-right">-->
-<!--            <view class="jfb-base&#45;&#45;card__body-card-item-right-top">-->
-<!--              <view v-if="1">-->
-<!--                <xd-font-icon icon="iconkaquan" size="30" style="margin-right: 10rpx"></xd-font-icon>-->
-<!--                <view>电影票兑换券</view>-->
-<!--              </view>-->
-<!--              <view>-->
-<!--                <view>ID:123454566</view>-->
-<!--                <view>有效期至:2024.05.10</view>-->
-<!--              </view>-->
-<!--            </view>-->
-<!--            <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom">-->
-<!--              <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom-info">-->
-<!--                <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom-info-residue">剩余次数：2</view>-->
-<!--              </view>-->
-<!--              <view :style="{background:$mainColor}">查看</view>-->
-<!--            </view>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
       <view class="jfb-base-card__body-disabled">
         失效票券
       </view>
       <view class="jfb-base-card__body-card">
-        <view v-for="(item,index) in disableList" :key="index"  class="jfb-base-card__body-card-item">
+        <view v-for="(item,index) in disableList" :key="index" class="jfb-base-card__body-card-item">
           <view class="jfb-base-card__body-card-item-left">
             <xd-font-icon color="#F0F0F0" size="55" icon="iconyouhuiquan"></xd-font-icon>
             <view>{{tabIndex===1?'登录':'转换'}}</view>
@@ -123,40 +102,18 @@
             </view>
             <view class="jfb-base-card__body-card-item-right-bottom">
               <view class="jfb-base-card__body-card-item-right-bottom-info">
-                <view v-if="item.unit==='点'" class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余点数：{{item.card_point}}</view>
-                <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{item.other_card_point}}</view>
+                <view v-if="item.unit==='点'" class="jfb-base-card__body-card-item-right-bottom-info-residue">
+                  剩余点数：{{item.card_point}}
+                </view>
+                <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">
+                  购买其他物品可抵：{{item.other_card_point}}
+                </view>
               </view>
               <view :style="{background:'#E5E5E5'}">查看</view>
             </view>
           </view>
         </view>
       </view>
-<!--      <view class="jfb-base&#45;&#45;card__body-card" v-else>-->
-<!--        <view v-for="(item,index) in 3" :key="index" class="jfb-base&#45;&#45;card__body-card-item">-->
-<!--          <view class="jfb-base&#45;&#45;card__body-card-item-left">-->
-<!--            <xd-font-icon color="#B8B7BE" size="55" icon="iconyouhuiquan"></xd-font-icon>-->
-<!--            <view>转换</view>-->
-<!--          </view>-->
-<!--          <view class="jfb-base&#45;&#45;card__body-card-item-right">-->
-<!--            <view class="jfb-base&#45;&#45;card__body-card-item-right-top">-->
-<!--              <view>-->
-<!--                <xd-font-icon color="#B8B7BE" icon="iconkaquan" size="30" style="margin-right: 10rpx"></xd-font-icon>-->
-<!--                <view>电影票兑换券</view>-->
-<!--              </view>-->
-<!--              <view>-->
-<!--                <view>ID:123454566</view>-->
-<!--                <view>有效期至:2024.05.10</view>-->
-<!--              </view>-->
-<!--            </view>-->
-<!--            <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom">-->
-<!--              <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom-info">-->
-<!--                <view class="jfb-base&#45;&#45;card__body-card-item-right-bottom-info-residue">剩余次数：2</view>-->
-<!--              </view>-->
-<!--              <view :style="{background:'#B8B7BE'}">查看</view>-->
-<!--            </view>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
     </view>
   </view>
 </template>
@@ -166,7 +123,7 @@
   import XdButton from "@/components/XdButton/XdButton";
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseCardMixin from "./JfbBaseCardMixin";
-  import {mapState,mapActions} from 'vuex'
+  import {mapState, mapActions} from 'vuex'
 
   export default {
     name: "JfbBaseCard",
@@ -179,7 +136,7 @@
     ],
     computed: {
       ...mapState({
-        jwxSDK: state=>state.jwxSDK
+        jwxSDK: state => state.jwxSDK
       })
     },
     data() {
@@ -209,17 +166,16 @@
        * @description 扫码绑定
        */
       handleScan() {
+        console.log(getApp().globalData, 'pageAtrr')
         jfbRootExec('getH5WxAuthorize', {
           vm: this,
-          data: {}
+          data: {url: window.location.href, partner_id: 161, site_id: 'wx_pub'}
         }).then(res => {
-          console.log(res, '0000000')
+          if (this.jwxSDK !== null) {
+            console.log(this.jwxSDK, 'this.jwxSDK')
+            //todo
+          }
         })
-        console.log(this.jwxSDK,'this.jwxSDK')
-        if (this.jwxSDK !== null) {
-          console.log(this.jwxSDK,'this.jwxSDK')
-          //todo
-        }
       },
       /**
        * @description 已绑定卡登录
@@ -243,7 +199,7 @@
 
           //无效卡
           if (item['is_valid'] !== 'Y') {
-            console.log(item,item['is_valid'],item['is_valide'] !== 'Y', 'itemitem')
+            console.log(item, item['is_valid'], item['is_valide'] !== 'Y', 'itemitem')
             return
           }
           this.$xdShowLoading({});
@@ -277,7 +233,7 @@
         }, false);
       },
       onJfbLoad(options) {
-        console.log(this.jwxSDK,'000000')
+        console.log(this.jwxSDK, '000000')
         this.$nextTick(() => {
           let {inCallback, isBack} = this.$xdUniHelper.parseURL()['params'];
           if (inCallback) this.inCallback = decodeURIComponent(inCallback);
@@ -287,22 +243,17 @@
         jfbRootExec('getListCardBind', {
 
           vm: this,
-           data: {
-          }
+          data: {}
 
-        }).then((res)=>{
-          // res=res.map(item=>{
-          //   item.is_valide =0
-          //   return item
-          // })
+        }).then((res) => {
           this.cardList = res.filter((item) => {
-            if (item['is_valide'] !== 0 && item['card_point'] !== 0) {
+            if (item['is_valide'] !== 'N' && item['card_point'] !== 0) {
               return true
             }
             return false
           });
           this.disableList = res.filter((item) => {
-            if (item['is_valide'] === 0 || item['card_point'] === 0) {
+            if (item['is_valide'] === 'N' || item['card_point'] === 0) {
               return true
             }
             return false
@@ -369,7 +320,7 @@
         display: flex;
         align-items: center;
         font-size: unit(28, rpx);
-        margin-bottom: unit(46,rpx);
+        margin-bottom: unit(46, rpx);
 
         & > view {
           width: unit(214, rpx);
@@ -382,8 +333,8 @@
       }
 
       &-tips {
-        font-size: unit(20,rpx);
-        margin-bottom: unit(46,rpx);
+        font-size: unit(20, rpx);
+        margin-bottom: unit(46, rpx);
       }
 
       &-card {
@@ -393,7 +344,7 @@
           justify-content: flex-start;
           border: unit(2, rpx) solid #EEEEEEFF;
           border-radius: unit(20, rpx);
-          margin-bottom: unit(30,rpx);
+          margin-bottom: unit(30, rpx);
 
           &-left {
             width: unit(200, rpx);
@@ -464,9 +415,9 @@
       }
 
       &-disabled {
-        font-size: unit(28,rpx);
+        font-size: unit(28, rpx);
         color: #B8B7BE;
-        margin-bottom: unit(30,rpx);
+        margin-bottom: unit(30, rpx);
       }
     }
   }

package/src/components/JfbBaseCard/JfbBaseCardMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCardBind/JfbBaseCardBindMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCardDetail/JfbBaseCardDetailMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCardInfo/JfbBaseCardInfoMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCardMy/JfbBaseCardMyMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });
 

package/src/components/JfbBaseCardShift/JfbBaseCardShiftMixin.js

@@ -151,7 +151,8 @@ export default {
       //设置已绑定数据
       Object.keys(AttrObj).map(type=>{
         AttrObj[type].map(item=>{
-           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
         })
       });