jufubao-base 1.0.28-beta15 → 1.0.28-beta151

package/commands.js

@@ -11,39 +11,74 @@ 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 handleJsonPackage = require('./build/version/Json');
 
 
-const init = ()=>{
+(async () => {
 
-  //判断是否从本地获取数据
-  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'));
+  let argv = utils.getArgv();
+  if (argv.length === 0) {
+    clog(`请传入参数， 例如： node ./commands.update.js true`, 'red');
+    process.exit(-1);
   }
+  let isLocal = argv[0] === 'true';
+  let is0ss = argv[1] === 'true';
 
-  utils.logsLine(clog, 'start');
+  //本地文件拷贝基础框架
+  if (isLocal) {
+    //复制插件库文件
+    clog(`从本地拷贝框架资源`, 'cyanBG');
+    utils.logsLine(clog);
+    execSync(`cross-env isLocal=true node ./build/commands/copy.init.js`, {stdio: 'inherit'});
+    clog(`完成更新`, 'cyan');
+    utils.logsLine(clog);
+    process.exit(0)
+  }
+
+  let isUpdate = false;
+  let currentPackage = require(fileHelper.getPlatformSurePath(`${basePath.buildRoot}/package.json`));
+  let baseLibrary = await handleJsonPackage.getByCodeJson('gxd-uni-library-editx');
+
+  //检查node_odules是否需要更新
+  let nodeModulesPath = fileHelper.getPlatformSurePath(basePath.buildRoot + '/node_modules/gxd-uni-library-editx/package.json');
+  let isNodeModulesVersionUpdate = true;
+  if (fileHelper.existFileSync(nodeModulesPath)) {
+    let temp = require(nodeModulesPath);
+    if (baseLibrary.version === temp.version) {
+      isNodeModulesVersionUpdate = false
+    }
+  }
 
-  //更新包
-  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);
+  if (baseLibrary.version !== currentPackage['dependencies'][baseLibrary.name]) {
+    currentPackage['dependencies'][baseLibrary.name] = baseLibrary.version;
+    fileHelper.writeFileSync(
+      fileHelper.getPlatformSurePath(fileHelper.getPlatformSurePath(basePath.buildRoot + '/package.json')),
+      JSON.stringify(currentPackage, null, 2)
+    )
+    isUpdate = true;
+  }
 
-  //复制插件库文件
-  clog(`拷贝框架资源`, 'cyanBG');
-  utils.logsLine(clog);
-  if(isLocal) execSync(`cross-env isLocal=true node ./build/commands/copy.init.js`, {stdio: 'inherit'});
-  else execSync(`cross-env isLocal=false node ./build/commands/copy.init.js`, {stdio: 'inherit'});
+  if (isUpdate || isNodeModulesVersionUpdate) {
+    //是否需要升级基础插件
+    let cmdStr = `npm i --registry=https://registry.npm.taobao.org && `;
 
-  utils.logsLine(clog);
-};
+    //复制插件库文件
+    cmdStr = `${cmdStr} cross-env oss=${is0ss} node ./build/commands/copy.init.js`;
 
-init();
+    clog(`完成更新框架资源`, 'cyanBG');
+    utils.logsLine(clog, 'start');
+    clog(`执行命令行：${cmdStr}`, 'cyan');
+    utils.logsLine(clog);
+    execSync(cmdStr, {stdio: 'inherit'});
+    clog(`完成更新`, 'cyan');
+    utils.logsLine(clog);
+  } else {
+    let cmdStr = `cross-env oss=${is0ss} node ./build/commands/copy.init.js`;
+    execSync(cmdStr, {stdio: 'inherit'});
+    clog(`完成更新`, 'cyan');
+    utils.logsLine(clog);
+  }
+})();
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.28-beta15",
+  "version": "1.0.28-beta151",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -10,14 +10,14 @@
     "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",
+    "update": "node ./commands/npmignore && node ./commands/update.pack.js",
     "create": "node ./commands/create.pack.js",
     "change": "node ./commands/change.pack",
-    "release": "node ./commands/npmignore && npm publish",
-    "replce": "node ./commands/vue.replce.js JfbBase",
+    "release": "node ./commands/release.js",
+    "replace": "node ./commands/vue.replce.js JfbBase",
     "view": "node ./commands/update.preview.js base",
-    "init": "cross-env isLocal=false node ./commands.js",
-    "init.local": "cross-env isLocal=true node ./commands.js",
+    "init": "node ./commands.js false",
+    "init.local": "node ./commands.js true",
     "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",
@@ -50,7 +50,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.8-beta9",
+    "gxd-uni-library-editx": "1.0.8-beta60",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",
@@ -58,7 +58,8 @@
     "regenerator-runtime": "^0.12.1",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",
-    "vuex": "^3.2.0"
+    "vuex": "^3.2.0",
+    "vconsole": "^3.15.0"
   },
   "repository": {
     "type": "git",
@@ -118,4 +119,4 @@
   "uni-app": {
     "scripts": {}
   }
-}
+}

package/src/common/authorize.js

@@ -21,8 +21,8 @@ class JfbAuthorize {
   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.cardPath = options.cardPath;
+    this.LoginPath = options.LoginPath;
 
     this.config = Object.assign({},{
       'user': 'JFB-CSRF-TOKEN-{siteID}',
@@ -82,9 +82,12 @@ class JfbAuthorize {
    * @param options {Object} 可选项，{expires: 1, domain: ''}, 过期时间单位：小时
    */
   removeToken(key, options = {}) {
+    key = this.getTokenKeyword(key);
     //#ifdef H5
     cookie.remove(key, options);
+    console.warn(`cookie.key=${key}`);
     //#endif
+    console.warn(`storage.key=${key}`);
     storage.remove(key);
   }
 
@@ -123,8 +126,15 @@ class JfbAuthorize {
    * @param $vm {Vue}
    */
   jumpToCardLogin($vm){
+    let redirect_url = '';
+    if (store.state.configProject.platform === 'mp.weixin') {
+      redirect_url = $vm['$xdUniHelper'].parseURL().source;
+    }
+    if (store.state.configProject.platform === 'h5') {
+      redirect_url = $vm.$route.fullPath;
+    }
     $vm['$xdUniHelper'].redirectTo({
-      url: this.cardPath + `?inCallback=${encodeURIComponent($vm.$route.fullPath)}`,
+      url: this.cardPath + `?inCallback=${encodeURIComponent(redirect_url)}`,
     });
   }
 
@@ -133,8 +143,15 @@ class JfbAuthorize {
    * @param $vm {Vue}
    */
   jumpToUserLogin($vm) {
+    let redirect_url = '';
+    if(store.state.configProject.platform === 'mp.weixin') {
+      redirect_url = $vm['$xdUniHelper'].parseURL().source;
+    }
+    if (store.state.configProject.platform === 'h5') {
+      redirect_url = $vm.$route.fullPath;
+    }
     $vm['$xdUniHelper'].redirectTo({
-      url: this.LoginPath + `?redirect_url=${encodeURIComponent($vm.$route.fullPath)}`,
+      url: this.LoginPath + `?redirect_url=${encodeURIComponent(redirect_url)}`,
     });
   }
 
@@ -170,6 +187,17 @@ class JfbAuthorize {
 
       //用户登陆判断
       let userToken = this.getToken('user');
+      //用户刷新token
+      let refreshToken = this.getToken('refresh');
+
+      //用户未登陆
+      if(!userToken && !refreshToken) {
+        if (isAutoJump) {
+          this.jumpToUserLogin($vm);
+        }
+        resolve(false);
+        return
+      }
 
       //去刷新token
       if (!userToken) store.dispatch('userRefreshToken')
@@ -187,6 +215,35 @@ class JfbAuthorize {
       }
     });
   }
+
+  /**
+   * @description 客户端设置所有token
+   * @param result
+   * @param cb {Function|null}
+   */
+  setAllToken(result,cb = null){
+    //#ifdef MP-WEIXIN
+    this.setToken('user', result['csrf_token'], {expires: result['csrf_token_expire_in']/60/60});
+    this.setToken('access', result['access_token'], {expires: result['access_token_expire_in'] / 60 / 60})
+    this.setToken('refresh', result['refresh_token'], {expires: result['refresh_token_expire_in'] / 60 / 60})
+    if(typeof cb === 'function') cb();
+    //#endif
+  }
+
+  /**
+   * @description 客户端删除所有token
+   * @param cb {Function|null}
+   */
+  removeAllToken(cb=null){
+    //#ifdef MP-WEIXIN
+    this.removeToken('user');
+    this.removeToken('access');
+    this.removeToken('refresh');
+    if (store.state.jfbAuthorize !== null) {
+      store.state.jfbAuthorize.setAllToken(res)
+    }
+    //#endif
+  }
 }
 
 /**

package/src/common/getBusinessImageUrl.js

@@ -24,7 +24,7 @@ function stringToNumber(str) {
 function getBusinessImageUrl(path, size = 'size8') {
   if (Object.prototype.toString.call(path)!== '[object String]' || path === '') {
     console.error('传入的路径（path）非字符串类型，请确认路径是否正确');
-    throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
+    //throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
   }
 
   let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;

package/src/common/getServiceUrl.js

@@ -24,7 +24,7 @@ function stringToNumber(str) {
 function getServiceUrl(path, size = 'size8') {
   if (Object.prototype.toString.call(path) !== '[object String]' || path === '') {
     console.error('传入的路径（path）非字符串类型，请确认路径是否正确');
-    throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
+    // throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
   }
 
   let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;

package/src/components/JfbBaseAddress/Attr.js

@@ -1,19 +1,23 @@
 'use strict';
-
+import StyleForm from "@/utils/StyleForm";
+let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,}, null, 'list');
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: '选取地区路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'location_url', //form[valueKey]
-      placeholder: '请选择选取地区路径',
-      value: null,
-      setting: {
-        router: XdBus.getParentData('getPagesTree'),
+  content: (data)=>{
+    return [
+      {
+        label: '选取地区路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'location_url', //form[valueKey]
+        placeholder: '请选择选取地区路径',
+        value: data.location_url || '',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
-      inline: false,
-    },
-  ],
+      ...styleForm.getForm(data, '内容配置')
+    ].filter(i=>i)
+  },
 }