wgt-node-utils 1.2.52 → 1.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgt-node-utils",
-  "version": "1.2.52",
+  "version": "1.2.54",
   "description": "WGT工具类包",
   "main": "dist/bundle.js",
   "scripts": {

package/src/index.js

@@ -108,13 +108,12 @@ class wgtNodeUtils {
         }
         return system;
     }
-
-    // 获取cloud front传回的设备信息
+    // 获取search site传回的设备信息
     getSearchSiteSystem = (device) => {
         const system = {
-            isAndroid: device,
-            isPhone: device,
-            isTablet: device
+            isAndroid: device === 'true',
+            isPhone: device === 'true',
+            isTablet: device === 'true'
         };
 
         // 其它设备均为空的情况下，默认当前设置为pc
@@ -124,6 +123,22 @@ class wgtNodeUtils {
         return system;
     }
 
+    // 获取template配置
+    // 判断当前是否是search模版
+    // @req 请求体
+    getGetTemplateConfiguration = (req) => {
+        const isSearchSite = req.headers['x-from-search'] === 'true' || false;
+        const hostname = isSearchSite ? req.headers['x-forwarded-host'] : req.hostname;
+        const device = this.getCloudFrontDevice(req.headers);
+        const system = isSearchSite ? this.getSearchSiteSystem(req.headers['x-is-mobile']) : this.getCloudFrontSystem(device);
+        
+        return {
+            isSearchSite,
+            hostname,
+            system
+        }
+    }
+
     /***
      * 通用头信息添加
      * @res node端 返回头
@@ -184,9 +199,9 @@ class wgtNodeUtils {
      * @buildName 打包名称
      * @version  打包版本号
      * @dirname 项目的绝对地址
-     * @useReactRouterDom 是否需要reactRouterDom
+     * @useGlobal 是否需要 global.css
      */
-    readF2eFiles = (buildName, version, dirname) => {
+    readF2eFiles = (buildName, version, dirname, useGlobal = false) => {
         console.log('静态资源:开始读取');
         return new Promise((resolve, reject) => {
             try {
@@ -209,8 +224,13 @@ class wgtNodeUtils {
 
                 // 增加preact依赖
                 this.fileContents['preact.min.js'] = fs.readFileSync(path.join(dirname, `../${buildName}/dist/preact.min.js`), 'utf8');
-                // 获取wgt-web-ui的css文件
-                this.fileContents['global.css'] = fs.readFileSync(path.join(dirname, `../${buildName}/assets/global.css`), 'utf8');
+                
+                // 增加wgt-web-ui的css文件
+                if (useGlobal) {
+                    // 获取wgt-web-ui的css文件
+                    this.fileContents['global.css'] = fs.readFileSync(path.join(dirname, `../${buildName}/assets/global.css`), 'utf8');
+                }
+                
 
                 console.log('静态资源列表:');