chore: 合并冲突

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
     globals: {
-        "AMap": true,
-        "L7": true,
+        'AMap': true,
+        'L7': true,
     },
     env: {
         browser: true,
@@ -15,9 +15,9 @@ module.exports = {
         ecmaVersion: 12,
         sourceType: 'module'
     },
-    plugins: ['@typescript-eslint',"unused-imports"],
+    plugins: ['@typescript-eslint','unused-imports'],
     rules: {
-        "unused-imports/no-unused-imports": "error",
+        'unused-imports/no-unused-imports': 'error',
         '@typescript-eslint/no-loss-of-precision':0,
         '@typescript-eslint/no-inferrable-types': 0,
         'no-constant-condition': 0,
@@ -29,7 +29,8 @@ module.exports = {
         'no-useless-catch': 0,
         '@typescript-eslint/explicit-module-boundary-types': 0,
         '@typescript-eslint/no-explicit-any':0,
-        "@typescript-eslint/no-unused-vars": 0,
+        '@typescript-eslint/no-unused-vars': 0,
+        '@typescript-eslint/no-duplicate-enum-values':0,
         'prefer-rest-params':0,
     },
     settings: {

build/merge_js_ts.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# 设置目标目录
+target_directory="packages/site/examples"
+
+# 设置合并后的文件名
+merged_file="merged_demo_code.txt"
+
+# 删除已存在的合并文件
+rm -f "$merged_file"
+
+# 遍历目标目录下的所有.md文件
+find "$target_directory" -type f \( -name "*.ts" -o -name "*.js" \) -print0 | while IFS= read -r -d $'\0' file; do
+    # 输出当前处理的文件名
+    echo "Merging $file"
+
+    # 使用cat命令将文件内容追加到合并文件中
+    cat "$file" >> "$merged_file"
+done
+
+echo "Merge complete. Merged file: $merged_file"

build/merge_md.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# 设置目标目录
+target_directory="packages/site/docs"
+
+# 设置合并后的文件名
+merged_file="merged.md"
+
+# 删除已存在的合并文件
+rm -f "$merged_file"
+
+# 遍历目标目录下的所有.md文件
+find "$target_directory" -type f -name "*.md" -print0 | while IFS= read -r -d $'\0' file; do
+    # 输出当前处理的文件名
+    echo "Merging $file"
+
+    # 使用cat命令将文件内容追加到合并文件中
+    cat "$file" >> "$merged_file"
+done
+
+echo "Merge complete. Merged file: $merged_file"

dev-demos/component/popup/layerPopup.tsx

@@ -144,6 +144,29 @@ const Demo: FunctionComponent = () => {
 
   return (
     <>
+      <div>
+        <button
+          onClick={() => {
+            popup?.setOptions({
+              trigger:
+                popup?.getOptions().trigger === 'click' ? 'hover' : 'click',
+            });
+            console.log(popup?.getOptions().trigger);
+          }}
+        >
+          切换
+        </button>
+
+        <button
+          onClick={() => {
+            popup?.setOptions({
+              items: [],
+            });
+          }}
+        >
+          清空 items
+        </button>
+      </div>
       <div
         id="map"
         style={{