raintee-maputils 1.0.23 → 1.0.24

package/dist/index.js

@@ -5819,9 +5819,9 @@ const treeDataAdapterNext = (data) => {
   return { treeData, checkedKeys }
 };
 const getLayerIdFidld = (str, field) => {
-  let kvs = str.split(';').map(kvstr => kvstr.split('='));
-  let layerId = kvs.find(item => item[0] === field)[1];
-  return layerId
+  const kvs = str.split(';').map(kvstr => kvstr.split('='));
+  const val = kvs.find(item => item[0] === field)[1];
+  return val
 };
 /**
  * 生成唯一ID字符串
@@ -5887,13 +5887,13 @@ function generateKeyValueTableHTML(data, options = {}) {
                   <tr style="background-color: '#f9f9f9';">
           <td style="
             padding: 8px 12px;
-            border: 1px solid #ccc;
+            border: 1px solid #f9f9f9;
             font-weight: bold;
             min-width: 100px;
           ">属性</td>
           <td style="
             padding: 8px 12px;
-            border: 1px solid #ccc;
+            border: 1px solid #f9f9f9;
             word-break: break-word;
           ">值</td>
         </tr>
@@ -5940,6 +5940,104 @@ function downloadByUrl(url, filename = '') {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+}
+/**
+ * 合并字符串键值对和对象，重复键的值覆盖，新键添加到末尾
+ * @param {string} str - 用';'分隔的key=value格式字符串
+ * @param {Object} obj - 要合并的对象
+ * @returns {string} - 合并后的key=value;key=value格式字符串
+ */
+function mergeStringAndObject(str, obj) {
+  // 1. 解析字符串为键值对数组
+  const parseStringToPairs = (inputStr) => {
+    if (!inputStr || typeof inputStr !== 'string') {
+      return [];
+    }
+
+    const pairs = [];
+    const segments = inputStr.split(';');
+
+    for (const segment of segments) {
+      const trimmedSegment = segment.trim();
+      if (!trimmedSegment) continue; // 跳过空字符串
+
+      const equalIndex = trimmedSegment.indexOf('=');
+      if (equalIndex === -1) {
+        // 如果没有等号，当作键，值为空字符串
+        pairs.push([trimmedSegment, '']);
+      } else {
+        const key = trimmedSegment.substring(0, equalIndex).trim();
+        const value = trimmedSegment.substring(equalIndex + 1).trim();
+        pairs.push([key, value]);
+      }
+    }
+
+    return pairs;
+  };
+
+  // 2. 解析对象为键值对数组
+  const parseObjectToPairs = (inputObj) => {
+    if (!inputObj || typeof inputObj !== 'object' || Array.isArray(inputObj)) {
+      return [];
+    }
+
+    const pairs = [];
+    for (const [key, value] of Object.entries(inputObj)) {
+      // 处理值的类型转换
+      let stringValue = '';
+      if (value === null || value === undefined) {
+        stringValue = '';
+      } else if (typeof value === 'string') {
+        stringValue = value;
+      } else if (typeof value === 'number' || typeof value === 'boolean') {
+        stringValue = value.toString();
+      } else {
+        // 对象、数组等复杂类型转为JSON字符串
+        stringValue = JSON.stringify(value);
+      }
+      pairs.push([key, stringValue]);
+    }
+
+    return pairs;
+  };
+
+  // 3. 合并键值对数组（重复键覆盖，新键追加）
+  const mergePairs = (strPairs, objPairs) => {
+    const mergedMap = new Map(); // 用于存储合并后的键值对，便于覆盖
+
+    // 先添加字符串中的键值对
+    for (const [key, value] of strPairs) {
+      mergedMap.set(key, value);
+    }
+
+    // 再添加对象中的键值对（重复键会覆盖）
+    for (const [key, value] of objPairs) {
+      mergedMap.set(key, value); // Map.set() 会自动覆盖重复键
+    }
+
+    // 转换为数组（Map 会保持插入顺序，新键自然在末尾）
+    return Array.from(mergedMap.entries());
+  };
+
+  // 4. 将键值对数组合并为字符串
+  const pairsToString = (pairs) => {
+    return pairs
+      .map(([key, value]) => `${key}=${value}`)
+      .join(';');
+  };
+
+  // 主流程
+  try {
+    const strPairs = parseStringToPairs(str);
+    const objPairs = parseObjectToPairs(obj);
+    const mergedPairs = mergePairs(strPairs, objPairs);
+    const result = pairsToString(mergedPairs);
+
+    return result;
+  } catch (error) {
+    console.error('合并过程中发生错误:', error);
+    return str; // 出错时返回原字符串
+  }
 }
 
 var RainteeSourceMapTool = /*#__PURE__*/Object.freeze({
@@ -5948,6 +6046,7 @@ var RainteeSourceMapTool = /*#__PURE__*/Object.freeze({
     downloadByUrl: downloadByUrl,
     generateKeyValueTableHTML: generateKeyValueTableHTML,
     getLayerIdFidld: getLayerIdFidld,
+    mergeStringAndObject: mergeStringAndObject,
     treeDataAdapter: treeDataAdapter,
     treeDataAdapterNext: treeDataAdapterNext
 });