From be0cfd366f118b482a0e981e3adb4eea6cbc165f Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 31 Aug 2024 16:53:17 +0800
Subject: [PATCH] 核心冲突
---
gz-customerSystem/package-lock.json | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 107 insertions(+), 0 deletions(-)
diff --git a/gz-customerSystem/package-lock.json b/gz-customerSystem/package-lock.json
index e3567d0..b56af68 100644
--- a/gz-customerSystem/package-lock.json
+++ b/gz-customerSystem/package-lock.json
@@ -14,6 +14,7 @@
"@ant-design/plots": "^1.2.5",
"@antv/g2": "^4.2.1",
"@arco-design/web-react": "^2.63.1",
+ "@arco-themes/react-gzzz": "^0.0.2",
"@craco/craco": "^6.4.3",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.2",
@@ -27,12 +28,17 @@
"import": "0.0.6",
"prop-types": "^15.8.1",
"react": "^17.0.2",
+ "react-bmapgl": "^0.2.27",
+ "react-custom-scrollbars": "^4.2.1",
"react-dom": "^17.0.2",
"react-infinite-scroll-component": "^6.1.0",
"react-router-dom": "^6.2.1",
"react-scripts": "5.0.0",
"react-virtual": "^2.10.4",
"web-vitals": "^2.1.4"
+ },
+ "devDependencies": {
+ "@arco-plugins/vite-react": "^1.3.3"
}
},
"node_modules/@adobe/css-tools": {
@@ -1193,6 +1199,34 @@
"version": "1.0.11",
"resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.11.tgz",
"integrity": "sha512-uUnglJowSe0IPmWOdDtrlHXof5CTIJitfJEyITHBW6zDVOGu9Pjk5puaLM73SLcwak0L4hEjO7Td88/a6P5i7A=="
+ },
+ "node_modules/@arco-plugins/vite-react": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmmirror.com/@arco-plugins/vite-react/-/vite-react-1.3.3.tgz",
+ "integrity": "sha512-fcGh/69xKGqIjMdIw6NCqst4uWME/WTYjiC6AxHbKBmeYSONazBYd+KtEDx9Be2N0pF4+sk+MGUDy3mrF13EdA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/generator": "^7.12.11",
+ "@babel/helper-module-imports": "^7.12.5",
+ "@babel/parser": "^7.12.11",
+ "@babel/traverse": "^7.12.12",
+ "@babel/types": "^7.12.12",
+ "@types/node": "^16.11.10"
+ }
+ },
+ "node_modules/@arco-plugins/vite-react/node_modules/@types/node": {
+ "version": "16.18.105",
+ "resolved": "https://registry.npmmirror.com/@types/node/-/node-16.18.105.tgz",
+ "integrity": "sha512-w2d0Z9yMk07uH3+Cx0N8lqFyi3yjXZxlbYappPj+AsOlT02OyxyiuNoNHdGt6EuiSm8Wtgp2YV7vWg+GMFrvFA==",
+ "dev": true
+ },
+ "node_modules/@arco-themes/react-gzzz": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmmirror.com/@arco-themes/react-gzzz/-/react-gzzz-0.0.2.tgz",
+ "integrity": "sha512-YQGlkswfowsuaodIevDPMx+UPpJW7Is6b3+xFKh49GDNCJf5sIz37bSiK5zxLsIl1pBj16PkUIXzm7Fq4AdHgw==",
+ "peerDependencies": {
+ "@arco-design/web-react": "^2.63.1"
+ }
},
"node_modules/@babel/code-frame": {
"version": "7.24.7",
@@ -6655,6 +6689,11 @@
"object-assign": "4.x"
}
},
+ "node_modules/add-px-to-style": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/add-px-to-style/-/add-px-to-style-1.0.0.tgz",
+ "integrity": "sha512-YMyxSlXpPjD8uWekCQGuN40lV4bnZagUwqa2m/uFv1z/tNImSk9fnXVMUI5qwME/zzI3MMQRvjZ+69zyfSSyew=="
+ },
"node_modules/address": {
"version": "1.1.2",
"resolved": "https://registry.npmmirror.com/address/-/address-1.1.2.tgz",
@@ -9457,6 +9496,16 @@
"license": "MIT",
"dependencies": {
"utila": "~0.4"
+ }
+ },
+ "node_modules/dom-css": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/dom-css/-/dom-css-2.1.0.tgz",
+ "integrity": "sha512-w9kU7FAbaSh3QKijL6n59ofAhkkmMJ31GclJIz/vyQdjogfyxcB6Zf8CZyibOERI5o0Hxz30VmJS7+7r5fEj2Q==",
+ "dependencies": {
+ "add-px-to-style": "1.0.0",
+ "prefix-style": "2.0.1",
+ "to-camel-case": "1.0.0"
}
},
"node_modules/dom-helpers": {
@@ -15719,6 +15768,11 @@
"node": ">=6.4.0"
}
},
+ "node_modules/mapvgl": {
+ "version": "1.0.0-beta.191",
+ "resolved": "https://registry.npmmirror.com/mapvgl/-/mapvgl-1.0.0-beta.191.tgz",
+ "integrity": "sha512-kbcLSXPSZybMgvJ0RTPEpISC6hpc27P/UwYCFASKLRe6Z7LC0Z11FwNXvQT/jkAK/LdBm2GqsE9i+GQViqRIYg=="
+ },
"node_modules/material-colors": {
"version": "1.2.6",
"resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -18025,6 +18079,11 @@
"integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==",
"license": "ISC"
},
+ "node_modules/prefix-style": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/prefix-style/-/prefix-style-2.0.1.tgz",
+ "integrity": "sha512-gdr1MBNVT0drzTq95CbSNdsrBDoHGlb2aDJP/FoY+1e+jSDPOb1Cv554gH2MGiSr2WTcXi/zu+NaFzfcHQkfBQ=="
+ },
"node_modules/prelude-ls": {
"version": "1.2.1",
"resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -18899,6 +18958,19 @@
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"license": "MIT"
},
+ "node_modules/react-bmapgl": {
+ "version": "0.2.27",
+ "resolved": "https://registry.npmmirror.com/react-bmapgl/-/react-bmapgl-0.2.27.tgz",
+ "integrity": "sha512-pCVAuYFwG0rU9j1u9sZ4IWNmUP84pFa5y8nq/lxjzMiQdl04iO39NkTdEg2YRLjF2NF11eigcal/Ne1+zPz4ng==",
+ "dependencies": {
+ "mapvgl": "^1.0.0-beta.189",
+ "shallowequal": "^1.1.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
"node_modules/react-clientside-effect": {
"version": "1.2.6",
"resolved": "https://registry.npmmirror.com/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz",
@@ -18934,6 +19006,20 @@
},
"peerDependencies": {
"react": ">=16.0.0"
+ }
+ },
+ "node_modules/react-custom-scrollbars": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmmirror.com/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz",
+ "integrity": "sha512-VtJTUvZ7kPh/auZWIbBRceGPkE30XBYe+HktFxuMWBR2eVQQ+Ur6yFJMoaYcNpyGq22uYJ9Wx4UAEcC0K+LNPQ==",
+ "dependencies": {
+ "dom-css": "^2.0.0",
+ "prop-types": "^15.5.10",
+ "raf": "^3.1.0"
+ },
+ "peerDependencies": {
+ "react": "^0.14.0 || ^15.0.0 || ^16.0.0",
+ "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0"
}
},
"node_modules/react-dev-utils": {
@@ -21575,6 +21661,14 @@
"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
"license": "BSD-3-Clause"
},
+ "node_modules/to-camel-case": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/to-camel-case/-/to-camel-case-1.0.0.tgz",
+ "integrity": "sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q==",
+ "dependencies": {
+ "to-space-case": "^1.0.0"
+ }
+ },
"node_modules/to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -21583,6 +21677,11 @@
"engines": {
"node": ">=4"
}
+ },
+ "node_modules/to-no-case": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmmirror.com/to-no-case/-/to-no-case-1.0.2.tgz",
+ "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg=="
},
"node_modules/to-regex-range": {
"version": "5.0.1",
@@ -21596,6 +21695,14 @@
"node": ">=8.0"
}
},
+ "node_modules/to-space-case": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/to-space-case/-/to-space-case-1.0.0.tgz",
+ "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
+ "dependencies": {
+ "to-no-case": "^1.0.0"
+ }
+ },
"node_modules/toggle-selection": {
"version": "1.0.6",
"resolved": "https://registry.npmmirror.com/toggle-selection/-/toggle-selection-1.0.6.tgz",
--
Gitblit v1.8.0