feature/feature/IO-3554-Form-Row-Layout - Fix search, bump deps, fix formlayout
This commit is contained in:
@@ -475,3 +475,18 @@
|
||||
margin-left: auto;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
|
||||
.global-search-autocomplete-fix {
|
||||
// Ant wrapper class names (common)
|
||||
.ant-select-selection-item,
|
||||
.ant-select-selection-placeholder {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
// rc-select internal class names (newer internal naming / fallback)
|
||||
.rc-select-content-value,
|
||||
.rc-select-placeholder {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ export default function GlobalSearchOs() {
|
||||
<span>
|
||||
<OwnerNameDisplay ownerObject={job} />
|
||||
</span>
|
||||
<span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
|
||||
<span>{`${job.v_model_yr || ""} ${job.v_make_desc`` || ""} ${job.v_model_desc || ""}`}</span>
|
||||
<span>{`${job.clm_no || ""}`}</span>
|
||||
<span>{`${job.plate_no || ""}`}</span>
|
||||
</Space>
|
||||
@@ -184,7 +184,9 @@ export default function GlobalSearchOs() {
|
||||
return (
|
||||
<AutoComplete
|
||||
options={data}
|
||||
onSearch={handleSearch}
|
||||
showSearch={{
|
||||
onSearch: handleSearch
|
||||
}}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key !== "Enter") return;
|
||||
const firstUrlForSearch = data?.[0]?.options?.[0]?.label?.props?.to;
|
||||
@@ -195,6 +197,7 @@ export default function GlobalSearchOs() {
|
||||
onClear={() => setData([])}
|
||||
>
|
||||
<Input.Search
|
||||
className="global-search-autocomplete-fix"
|
||||
size="large"
|
||||
placeholder={t("general.labels.globalsearch")}
|
||||
enterButton
|
||||
|
||||
@@ -172,6 +172,7 @@ export default function GlobalSearch() {
|
||||
}}
|
||||
>
|
||||
<Input.Search
|
||||
className="global-search-autocomplete-fix"
|
||||
size="large"
|
||||
placeholder={t("general.labels.globalsearch")}
|
||||
enterButton
|
||||
|
||||
@@ -133,14 +133,16 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
|
||||
</FormRow>
|
||||
)
|
||||
})}
|
||||
<Divider titlePlacement="left" orientation="horizontal" style={{ marginTop: ".8rem", float: "right" }}>
|
||||
{t("jobs.forms.laborrates")}
|
||||
</Divider>
|
||||
<Space>
|
||||
<JobsDetailRatesChangeButton form={form} disabled={jobRO} />
|
||||
{InstanceRenderManager({ imex: <JobsMarkPstExempt form={form} /> })}
|
||||
</Space>
|
||||
<FormRow noDivider>
|
||||
|
||||
<FormRow
|
||||
extra={
|
||||
<Space>
|
||||
<JobsDetailRatesChangeButton form={form} disabled={jobRO} />
|
||||
{InstanceRenderManager({ imex: <JobsMarkPstExempt form={form} /> })}
|
||||
</Space>
|
||||
}
|
||||
header={t("jobs.forms.laborrates")}
|
||||
>
|
||||
<Form.Item label={t("jobs.fields.labor_rate_desc")} name="labor_rate_desc">
|
||||
<Input disabled={jobRO} />
|
||||
</Form.Item>
|
||||
|
||||
Reference in New Issue
Block a user