diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index f39158a..9da2057 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,9 +1,5 @@ { -<<<<<<< Updated upstream - "name": "Review2", -======= "name": "boss", ->>>>>>> Stashed changes "lockfileVersion": 3, "requires": true, "packages": { @@ -38,7 +34,6 @@ "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -835,7 +830,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -4701,6 +4695,27 @@ "dev": true, "license": "ISC" }, + "node_modules/ws": { + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", + "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xml2js": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", diff --git a/supply.html b/supply.html index 568f80a..892bc84 100644 --- a/supply.html +++ b/supply.html @@ -1440,6 +1440,8 @@ .select-body { flex: 1; overflow-y: auto; + -webkit-overflow-scrolling: touch; + overscroll-behavior: contain; } .select-search { @@ -7128,7 +7130,7 @@ const target = e.target; const createSupplyModal = document.getElementById('createSupplyModal'); - // 如果触摸目标在模态框内,检查是否需要阻止滚动 + // 检查触摸目标是否在创建货源模态框内 if (createSupplyModal && createSupplyModal.contains(target)) { // 获取模态框内容元素 const modalContent = document.querySelector('#createSupplyModal .modal-content'); @@ -7146,6 +7148,15 @@ return; } + // 检查触摸目标是否在选择弹窗内 + const selectModals = document.querySelectorAll('.select-modal'); + for (const selectModal of selectModals) { + if (selectModal.contains(target)) { + // 允许选择弹窗内的滚动 + return; + } + } + // 阻止页面滚动 e.preventDefault(); };