@tmsfe/tms-core 0.0.11 → 0.0.15

package/dist/index-proxy.js

@@ -131,6 +131,16 @@ function getLocationManager() {
         return setUserLocation;
       }
 
+      if (name === 'locForNoAuth') {
+        return {
+          province: '广东省',
+          cityCode: '440300',
+          cityName: '深圳市',
+          latitude: 22.54286,
+          longitude: 114.05956
+        };
+      }
+
       return function (...args) {
         return ps.then(() => invoke(manager, name, args));
       };

package/dist/index.js

@@ -28,6 +28,17 @@ const getSystemInfo$1 = () => {
     host
   };
 };
+
+const handleParamOfDifferentType = param => {
+  const data = new Array(41);
+  Object.keys(param).forEach(key => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
+  });
+  return data;
+};
+
+const defAssign = (value, defaultValue) => value || defaultValue;
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -45,20 +56,20 @@ class FastReport {
    * @param {Boolean} appVer 是否上报小程序版本
    * @returns {Promsie} 返回上报结果
    */
-  static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
+  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
     var _data$;
 
-    if (!(param !== null && param !== void 0 && param[27])) return Promise.reject('invalid report param');
-    const data = new Array(41);
+    if (!param[27]) return Promise.reject('invalid report param');
     const env = getEnvInfo();
-    Object.keys(param).forEach(key => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo$1()));
-    appVer && !data[10] && (data[10] = env.appVersion);
-    if (!data[26]) data[26] = (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0];
+
+    if (appVer) {
+      data[10] = defAssign(data[10], env.appVersion);
+    }
+
+    data[26] = defAssign(data[26], (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0]);
     data[28] = env.client;
 
     if (reportShowScene && !data[29]) {
@@ -117,6 +128,17 @@ const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((pat
 
   return {}; // 没找到配置，返回一个空对象
 });
+
+const formatConfigPaths = configPath => {
+  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const {
+    client
+  } = getEnvInfo();
+  configPaths.forEach((path, index) => {
+    configPaths[index] = path.replace(/\$\{client\}/, client);
+  });
+  return configPaths;
+};
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -154,14 +176,8 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
     }
   }
 
-  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg]) || null;
-  const {
-    client
-  } = getEnvInfo();
-  configPaths.forEach((path, index) => {
-    configPaths[index] = path.replace(/\$\{client\}/, client);
-  });
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
   const api = new Request();
   return api.post('marketing/config', {
@@ -543,6 +559,8 @@ function getWxLocation(type = defaultLocationType) {
         });
     });
 }
+// 是否开启监听位置变更
+let isListenerLocation = false;
 /**
  * @class Location
  * @classdesc 基于微信api，封装location相关的接口。 包括监听位置变化， 获取用户位置信息
@@ -550,11 +568,14 @@ function getWxLocation(type = defaultLocationType) {
  */
 class LocationBase {
     /**
-     * @private 构造函数
+     * @private 开启监听位置变更，要在授权之后才能开启
      */
-    constructor() {
-        wx.onLocationChange(this.subscribeLocationChnage);
-        wx.startLocationUpdate({});
+    listenerLocation() {
+        if (!isListenerLocation) {
+            isListenerLocation = true;
+            wx.onLocationChange(this.subscribeLocationChnage);
+            wx.startLocationUpdate({});
+        }
     }
     /**
      * 获取用户当前位置(经纬度)
@@ -604,6 +625,7 @@ class LocationBase {
     getWxLocationPromise(showModalWhenCloseAuth, type, content = '', showCancel = true) {
         return new Promise((resolve, reject) => {
             getWxLocation(type).then((res) => {
+                this.listenerLocation();
                 userLocationCache$1 = res;
                 // 更新用户状态 -- todo
                 updateLocStatus(true);
@@ -1248,16 +1270,21 @@ const formatReportData = async (reportData, deviceData) => {
 
   }; // 对部分空数据使用默认数据填充
 
-  Object.keys(defaultReportData).forEach(key => {
-    param[key] = param[key] !== null && JSON.stringify(param[key]) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return arr.some(item => !!item) ? paramItem : defaultData || '';
+  };
+
+  Object.keys(defaultReportData).forEach(index => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   }); // 所有上报数据都转换为字符串
 
   param.forEach((reportItem, index) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = paramItem || paramItem === 0 ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });
   return param.map(item => item !== null ? encodeURIComponent(item) : item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.11",
+  "version": "0.0.15",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
@@ -34,12 +34,8 @@
     "rollup": "^2.6.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^6.1.0",
-    "rollup-plugin-typescript2": "0.27.0",
-    "typescript": "^4.5.2"
+    "rollup-plugin-typescript2": "0.27.0"
   },
   "author": "tms·web",
-  "gitHead": "72bf52451594b49a1c9f78edbad5956d414a66ca",
-  "dependencies": {
-    "rollup-plugin-replace": "^2.2.0"
-  }
+  "gitHead": "72bf52451594b49a1c9f78edbad5956d414a66ca"
 }

package/rollup.config.js

@@ -98,7 +98,7 @@ function createConfig(format, output, plugins = []) {
         // exclude: ['node_modules/**'],
       }),
       // terser(),
-      // createReplacePlugin(),
+      createReplacePlugin(),
       ...extralPlugin,
       ...plugins,
     ],

package/src/config.js

@@ -15,6 +15,15 @@ const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((pat
   return {}; // 没找到配置，返回一个空对象
 });
 
+const formatConfigPaths = (configPath) => {
+  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const { client } = getEnvInfo();
+  configPaths.forEach((path, index) => {
+    configPaths[index] = path.replace(/\$\{client\}/, client);
+  });
+  return configPaths;
+};
+
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -47,12 +56,8 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
       }
     }
   }
-  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = (defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg])) || null;
-  const { client } = getEnvInfo();
-  configPaths.forEach((path, index) => {
-    configPaths[index] = path.replace(/\$\{client\}/, client);
-  });
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
   const api = new Request();
   return api.post('marketing/config', {

package/src/fastreport.js

@@ -16,6 +16,20 @@ const getSystemInfo = () => {
   return { model, wxVersion, platform, SDKVersion, host };
 };
 
+const handleParamOfDifferentType = (param) => {
+  const data = new Array(41);
+  Object.keys(param).forEach((key) => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];
+    else if (valType === 'object') data[key] = JSON.stringify(param[key]);
+    else data[key] = String(param[key]);
+  });
+
+  return data;
+};
+
+const defAssign = (value, defaultValue) => (value || defaultValue);
+
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -31,20 +45,16 @@ export default class FastReport {
    * @param {Boolean} appVer 是否上报小程序版本
    * @returns {Promsie} 返回上报结果
    */
-  static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
-    if (!param?.[27]) return Promise.reject('invalid report param');
-    const data = new Array(41);
+  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
+    if (!param[27]) return Promise.reject('invalid report param');
     const env = getEnvInfo();
-    Object.keys(param).forEach((key) => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];
-      else if (valType === 'object') data[key] = JSON.stringify(param[key]);
-      else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo()));
-    appVer && !data[10] && (data[10] = env.appVersion);
-    if (!data[26]) data[26] = data[27]?.[0];
+    if (appVer) {
+      data[10] = defAssign(data[10], env.appVersion);
+    }
+    data[26] = defAssign(data[26], data[27]?.[0]);
     data[28] = env.client;
     if (reportShowScene && !data[29]) {
       const appShowScene = wx.getStorageSync('appShowScene');

package/src/index-proxy.js

@@ -134,6 +134,15 @@ function getLocationManager() {
       if (name === 'setUserLocation') {
         return setUserLocation;
       }
+      if (name === 'locForNoAuth') {
+        return {
+          province: '广东省',
+          cityCode: '440300',
+          cityName: '深圳市',
+          latitude: 22.54286,
+          longitude: 114.05956,
+        };
+      }
       return function (...args) {
         return ps.then(() => invoke(manager, name, args));
       };

package/src/location/base.ts

@@ -29,6 +29,9 @@ function getWxLocation(type: string = defaultLocationType): Promise<WxPostionTyp
   });
 }
 
+// 是否开启监听位置变更
+let isListenerLocation = false;
+
 /**
  * @class Location
  * @classdesc 基于微信api，封装location相关的接口。 包括监听位置变化， 获取用户位置信息
@@ -36,11 +39,14 @@ function getWxLocation(type: string = defaultLocationType): Promise<WxPostionTyp
  */
 class LocationBase {
   /**
-   * @private 构造函数
+   * @private 开启监听位置变更，要在授权之后才能开启
    */
-  constructor() {
-    wx.onLocationChange(this.subscribeLocationChnage);
-    wx.startLocationUpdate({});
+  listenerLocation() {
+    if (!isListenerLocation) {
+      isListenerLocation = true;
+      wx.onLocationChange(this.subscribeLocationChnage);
+      wx.startLocationUpdate({});
+    }
   }
 
   /**
@@ -95,6 +101,7 @@ class LocationBase {
   public getWxLocationPromise(showModalWhenCloseAuth: boolean, type: string, content = '', showCancel = true) {
     return new Promise((resolve, reject) => {
       getWxLocation(type).then((res: WxPostionType) => {
+        this.listenerLocation();
         userLocationCache = res;
         // 更新用户状态 -- todo
         updateLocStatus(true);

package/src/report.js

@@ -212,8 +212,14 @@ const formatReportData = async (reportData, deviceData) => {
     36: getAppShowOptions(),       // 打开小程序的场景值及参数
   };
   // 对部分空数据使用默认数据填充
-  Object.keys(defaultReportData).forEach((key) => {
-    param[key] = (param[key] !== null && JSON.stringify(param[key])) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return (arr.some(item => !!item)) ? paramItem : (defaultData || '');
+  };
+
+  Object.keys(defaultReportData).forEach((index) => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   });
 
   // 所有上报数据都转换为字符串
@@ -221,8 +227,7 @@ const formatReportData = async (reportData, deviceData) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = (paramItem || paramItem === 0) ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });