Merge origin/release/test and preserve procurement direction with request unlock
This commit is contained in:
@@ -285,6 +285,11 @@
|
||||
--el-input-hover-border-color: var(--el-color-primary);
|
||||
--el-input-bg-color: var(--admin-surface);
|
||||
}
|
||||
:is(.admin-density, .admin-density-dialog) .density-form--outlined :is(.el-input, .el-textarea) {
|
||||
--el-input-border-color: var(--el-border-color);
|
||||
--el-input-hover-border-color: var(--el-border-color-hover);
|
||||
--el-input-bg-color: var(--admin-surface);
|
||||
}
|
||||
:is(.admin-density, .admin-density-dialog) .density-table-editor { display: flex; align-items: center; gap: var(--admin-space-3); min-width: 0; }
|
||||
:is(.admin-density, .admin-density-dialog) .density-table-editor .el-input-number { flex: 1; width: 100%; min-width: 0; }
|
||||
:is(.admin-density, .admin-density-dialog) .density-table--editable .el-input__inner { text-align: left; }
|
||||
|
||||
@@ -221,6 +221,14 @@ const cssRoot = (css: string) => {
|
||||
}
|
||||
|
||||
describe('approved Admin density ownership', () => {
|
||||
it('keeps domestic pallet metric appearance owned by shared workbench styles', () => {
|
||||
const page = parse(read('modules/warehouse-resources/pallets/pages/PalletsView.vue')).descriptor
|
||||
const css = page.styles.map(style => style.content).join('\n')
|
||||
expect(page.template!.content).toContain('workbench-metric workbench-tone is-compact')
|
||||
expect(css).not.toMatch(/\.summary-grid\s+(?:article|span|strong|\.idle|\.occupied)\b/)
|
||||
expect(css).not.toMatch(/\.workbench-metric[\s.{]/)
|
||||
})
|
||||
|
||||
it('lets local transport editors fill the workspace and keeps form density in shared primitives', () => {
|
||||
const editor = read('modules/overseas-business/pages/TransportOrderFormView.vue')
|
||||
const demand = parse(read('modules/overseas-business/components/TransportDemandForm.vue')).descriptor
|
||||
@@ -290,6 +298,27 @@ describe('approved Admin density ownership', () => {
|
||||
expect(view.styles.map(style => style.content).join('\n')).not.toContain('--el-input-border-color')
|
||||
})
|
||||
|
||||
it('outlines opted-in customer forms without overriding native focus, validation or disabled styles', () => {
|
||||
const rules = new Map<string, Record<string, string>>()
|
||||
cssRoot(shared).walkRules(rule => {
|
||||
const values: Record<string, string> = {}
|
||||
rule.walkDecls(decl => { values[decl.prop] = decl.value })
|
||||
rules.set(rule.selector, values)
|
||||
})
|
||||
expect(rules.get(':is(.admin-density, .admin-density-dialog) .density-form--outlined :is(.el-input, .el-textarea)')).toEqual({
|
||||
'--el-input-border-color': 'var(--el-border-color)',
|
||||
'--el-input-hover-border-color': 'var(--el-border-color-hover)',
|
||||
'--el-input-bg-color': 'var(--admin-surface)',
|
||||
})
|
||||
const customerRules = new Map<string, Record<string, string>>()
|
||||
cssRoot(read('modules/customers/customerDensity.css')).walkRules(rule => {
|
||||
const values: Record<string, string> = {}
|
||||
rule.walkDecls(decl => { values[decl.prop] = decl.value })
|
||||
customerRules.set(rule.selector, values)
|
||||
})
|
||||
expect(customerRules.get('.customer-editor-dialog .density-form--outlined .el-input-number .el-input__inner')).toEqual({ 'text-align': 'left' })
|
||||
})
|
||||
|
||||
it('outlines only the three opted-in customer billing editors without overriding native focus or disabled styles', () => {
|
||||
const rules = new Map<string, Record<string, string>>()
|
||||
cssRoot(shared).walkRules(rule => {
|
||||
@@ -1335,10 +1364,10 @@ describe('approved Admin density ownership', () => {
|
||||
const board = read('modules/overseas-warehouse/components/SmartDispatchCargoBoard.vue')
|
||||
const fields = read('modules/overseas-warehouse/components/DispatchResourceFields.vue')
|
||||
expect(source).toContain('fullscreenable')
|
||||
expect(source).toContain('density-table density-table--editable dispatch-create-table')
|
||||
expect(source).toContain('aria-label="排车设置"')
|
||||
expect(source).not.toContain('<DispatchResourceFields')
|
||||
expect(source).toContain('<SmartDispatchCargoBoard')
|
||||
expect(source).toContain('label-position="left" label-width="130px"')
|
||||
expect(source).toContain('label-position="left" label-width="70px"')
|
||||
expect(source).toContain('class="dispatch-context-toolbar"')
|
||||
expect(source).not.toContain('class="density-dialog-section dispatch-draft-toolbar"')
|
||||
expect(source).toContain('<template #vehicle-controls>')
|
||||
@@ -1379,18 +1408,17 @@ describe('approved Admin density ownership', () => {
|
||||
it('keeps dispatch workflow and owned evidence on shared compact sections', () => {
|
||||
const workflow = read('modules/overseas-warehouse/components/DispatchWorkflowDialog.vue')
|
||||
const maintenance = read('modules/overseas-warehouse/components/DispatchVehicleMaintenanceForm.vue')
|
||||
const cargo = read('modules/overseas-warehouse/components/SmartDispatchExistingCargo.vue')
|
||||
const evidence = read('modules/overseas-warehouse/components/DispatchEvidenceFiles.vue')
|
||||
expect(workflow).toContain(':fullscreenable="width !== \'560px\'"')
|
||||
expect(workflow).toContain('<DispatchVehicleMaintenanceForm')
|
||||
expect(maintenance).toContain('<DispatchResourceFields continuous')
|
||||
expect(maintenance).toMatch(/<DispatchResourceFields\b[^>]*\bcontinuous\b/)
|
||||
expect(maintenance).toContain('density-table density-table--editable maintenance-table')
|
||||
expect(workflow).toContain('label-position="left" label-width="130px"')
|
||||
expect(workflow).toContain(':confirm-loading="submitting || busy || uploadingEvidence"')
|
||||
expect(workflow).not.toContain('aria-label="候选货物分页"')
|
||||
expect(cargo).toContain('class="existing-cargo density-dialog-sections"')
|
||||
expect(cargo).toContain('<SmartDispatchCargoBoard')
|
||||
expect(cargo).toContain('aria-label="当前排车货物"')
|
||||
expect(workflow).toContain("isReview.value ? '1100px'")
|
||||
expect(workflow).toContain('aria-label="排车与预约"')
|
||||
expect(workflow).toContain('aria-label="审核照片"')
|
||||
for (const tone of ['source', 'work']) {
|
||||
expect(workflow).toContain(`data-tone="${tone}"`)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user