@cloudcare/rum-uniapp 2.1.10 → 2.1.11

package/cjs/boot/buildEnv.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = {
-  sdkVersion: '2.1.10',
+  sdkVersion: '2.1.11',
   sdkName: 'df_uniapp_rum_sdk'
 };
 exports.buildEnv = buildEnv;

package/cjs/core/transport.js

@@ -13,8 +13,6 @@ var _lifeCycle = require("../core/lifeCycle");
 
 var _dataMap = require("./dataMap");
 
-var _enums = require("../helper/enums");
-
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
 var CUSTOM_KEYS = 'custom_keys';
@@ -80,30 +78,6 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
         }
       });
-
-      if (message.tags && (0, _utils.isObject)(message.tags) && !(0, _utils.isEmptyObject)(message.tags)) {
-        // 自定义tag， 存储成field
-        var _tagKeys = [];
-        (0, _utils.each)(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || (0, _utils.isNumber)(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.fields[_key] = _value; // 这里不需要转译
-
-            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowField)(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.fields[CUSTOM_KEYS] = (0, _utils.escapeRowField)(_tagKeys);
-          fieldsStr.push((0, _utils.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _utils.escapeRowField)(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       (0, _utils.each)(value.fields, function (_value, _key) {
         if ((0, _utils.isArray)(_value) && _value.length === 2) {
@@ -132,6 +106,29 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         }
       });
 
+      if (message.tags && (0, _utils.isObject)(message.tags) && !(0, _utils.isEmptyObject)(message.tags)) {
+        // 自定义tag， 存储成field
+        var _tagKeys = [];
+        (0, _utils.each)(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || (0, _utils.isNumber)(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowField)(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.fields[CUSTOM_KEYS] = (0, _utils.escapeRowField)(_tagKeys);
+          fieldsStr.push((0, _utils.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _utils.escapeRowField)(_tagKeys));
+        }
+      }
+
       if (tagsStr.length) {
         rowStr += tagsStr.join(',');
       }

package/esm/boot/buildEnv.js

@@ -1,4 +1,4 @@
 export var buildEnv = {
-  sdkVersion: '2.1.10',
+  sdkVersion: '2.1.11',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/esm/core/transport.js

@@ -1,8 +1,7 @@
 import { findByPath, escapeRowData, isNumber, each, isString, values, extend, isObject, isEmptyObject, isArray, escapeRowField, escapeJsonValue, toServerDuration } from '../helper/utils';
 import { sdk } from '../core/sdk';
 import { LifeCycleEventType } from '../core/lifeCycle';
-import { commonTags, dataMap } from './dataMap';
-import { RumEventType } from '../helper/enums'; // https://en.wikipedia.org/wiki/UTF-8
+import { commonTags, dataMap } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
 
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
 var CUSTOM_KEYS = 'custom_keys';
@@ -65,30 +64,6 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
         }
       });
-
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag， 存储成field
-        var _tagKeys = [];
-        each(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || isNumber(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.fields[_key] = _value; // 这里不需要转译
-
-            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys);
-          fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       each(value.fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
@@ -117,6 +92,29 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         }
       });
 
+      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
+        // 自定义tag， 存储成field
+        var _tagKeys = [];
+        each(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || isNumber(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.fields[_key] = _value; // 这里不需要转译
+
+            fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys);
+          fieldsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys));
+        }
+      }
+
       if (tagsStr.length) {
         rowStr += tagsStr.join(',');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudcare/rum-uniapp",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"main": "cjs/index.js",
 	"module": "esm/index.js",
 	"miniprogram": "cjs",