Browse Source

fix(gui-v2): required form fields logic

pull/3030/head
Wing-Kam Wong 2 years ago
parent
commit
3ff70ff87b
  1. 11
      packages/nc-gui-v2/components/smartsheet/Form.vue

11
packages/nc-gui-v2/components/smartsheet/Form.vue

@ -140,7 +140,7 @@ function onMove(event: any) {
} }
function hideColumn(idx: number) { function hideColumn(idx: number) {
if (isDbRequired(localColumns.value[idx])) { if (isDbRequired(localColumns.value[idx]) || localColumns.value[idx].required) {
toast.info("Required field can't be removed") toast.info("Required field can't be removed")
return return
} }
@ -170,12 +170,16 @@ async function addAllColumns() {
async function removeAllColumns() { async function removeAllColumns() {
for (const col of (formColumnData as Record<string, any>)?.value) { for (const col of (formColumnData as Record<string, any>)?.value) {
if (isDbRequired(col) || col.required) { if (isDbRequired(col) || !!col.required) {
continue continue
} }
col.show = false col.show = false
} }
await hideAll((localColumns as Record<string, any>)?.value.filter(isDbRequired).map((f: Record<string, any>) => f.fk_column_id)) await hideAll(
(localColumns as Record<string, any>)?.value
.filter((f: Record<string, any>) => isDbRequired(f) || !!f.required)
.map((f: Record<string, any>) => f.fk_column_id),
)
$e('a:form-view:remove-all') $e('a:form-view:remove-all')
} }
@ -286,6 +290,7 @@ watch(
<a-card size="small" class="ma-0 pa-0 cursor-pointer item mb-2"> <a-card size="small" class="ma-0 pa-0 cursor-pointer item mb-2">
<div class="flex"> <div class="flex">
<div class="flex flex-row flex-1"> <div class="flex flex-row flex-1">
{{ element.required }}
<SmartsheetHeaderVirtualCell <SmartsheetHeaderVirtualCell
v-if="isVirtualCol(element)" v-if="isVirtualCol(element)"
:column="{ ...element, title: element.label || element.title }" :column="{ ...element, title: element.label || element.title }"

Loading…
Cancel
Save