WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 7 Packages Projects Releases Wiki Activity

Merge origin/main and restore warehouse mapping

Browse Source
This commit is contained in:
chenxi 2026-09-28 16:15:52 +08:00
commit e6cf253a1f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/business/pages/partials/directory-table.blade.php
View File

@ -1793,8 +1793,11 @@
const table = tableScope?.querySelector('.directory-table') || section?.querySelector('.directory-table');
const search = tools.querySelector('[data-directory-search]');
if (!table || !search) return;
const shortNameSort = table.querySelector('[data-inventory-short-name-sort]');
shortNameSort?.addEventListener('click', () => {
table.addEventListener('click', (event) => {
const shortNameSort = event.target instanceof Element
? event.target.closest('[data-inventory-short-name-sort]')
: null;
if (!shortNameSort) return;
const header = shortNameSort.closest('th');
const ascending = header.getAttribute('aria-sort') !== 'ascending';
const rows = [...table.tBodies[0].querySelectorAll('tr:not(.is-empty)')];

2
scripts/deploy-from-workstation.ps1
View File

@ -430,7 +430,7 @@ try {
}
if ($previousSha -and $previousShaExists) {
$migrationChanges = git diff --name-only "$previousSha..$deploySha" -- `
$migrationChanges = git diff --diff-filter=ACMRTUXB --name-only "$previousSha..$deploySha" -- `
database/migrations `
':(glob)modules/*/Database/Migrations/*.php'
if ($migrationChanges -and -not $AllowMigrations) {