feat: 优化表单必填判断

刘汉宸
1 parent 7d0bbda6
Showing 1 changed file with 29 additions and 26 deletions Show diff stats
packages/schema-page/index.vue
@@ -99,33 +99,37 @@
         <template v-else>
           <!-- 新增/修改弹出框内容 -->
           <template v-if="['new', 'edit'].includes(modalType)">
-            <z-schema-form
-              :key="`form-${modalType}`"
-              ref="form"
-              :value="valueForm"
-              @input="e => $emit('update:value-form', e)"
-              :schema="schema.form"
-              @submit="onFormSubmit"
-              @cancel="closeDialog"
-            >
-              <template v-for="item in getSlotKeys('form-')" #[item.name]="slotScope">
-                <slot :name="item.slot" v-bind="{ ..._slotScope, ...slotScope }"></slot>
-              </template>
-              <template #footer="{ submit, cancel }">
-                <div style="text-align: center; width: 100%">
-                  <el-button :size="_size" type="primary" @click="submit" :loading="submitting">确定</el-button>
-                  <el-button :size="_size" plain @click="cancel">取消</el-button>
-                </div>
-              </template>
-            </z-schema-form>
+            <template v-if="schema.form">
+              <z-schema-form
+                :key="`form-${modalType}`"
+                ref="form"
+                :value="valueForm"
+                @input="e => $emit('update:value-form', e)"
+                :schema="schema.form"
+                @submit="onFormSubmit"
+                @cancel="closeDialog"
+              >
+                <template v-for="item in getSlotKeys('form-')" #[item.name]="slotScope">
+                  <slot :name="item.slot" v-bind="{ ..._slotScope, ...slotScope }"></slot>
+                </template>
+                <template #footer="{ submit, cancel }">
+                  <div style="text-align: center; width: 100%">
+                    <el-button :size="_size" type="primary" @click="submit" :loading="submitting">确定</el-button>
+                    <el-button :size="_size" plain @click="cancel">取消</el-button>
+                  </div>
+                </template>
+              </z-schema-form>
+            </template>
           </template>
           <!-- 详情弹出框内容 -->
           <template v-else-if="modalType === 'detail'">
-            <z-schema-form key="form-detail" ref="form" v-model="detail" :schema="schema.detail || detailSchema">
-              <template v-for="item in getSlotKeys('detail-')" #[item.name]="slotScope">
-                <slot :name="item.slot" v-bind="{ ..._slotScope, ...slotScope }"></slot>
-              </template>
-            </z-schema-form>
+            <template v-if="schema.form || schema.detail">
+              <z-schema-form key="form-detail" ref="form" v-model="detail" :schema="schema.detail || detailSchema">
+                <template v-for="item in getSlotKeys('detail-')" #[item.name]="slotScope">
+                  <slot :name="item.slot" v-bind="{ ..._slotScope, ...slotScope }"></slot>
+                </template>
+              </z-schema-form>
+            </template>
           </template>
         </template>
       </div>
@@ -189,7 +193,7 @@ export default {
       modalType: this.dialogType || 'none',
       modalTitle: this.dialogTitle || '',
       modalProps: {},
-      detailSchema: filterout(cloneDeep(this.schema.form), ['is', 'rules']),
+      detailSchema: filterout(cloneDeep(this.schema.form || {}), ['is', 'rules']),
       detail: this.valueDetail || {},
       tableData: this.valueTable || [],
       loading: false,
@@ -201,7 +205,6 @@ export default {
     if (this.auto || this.schema.auto) {
       this.onSearch();
     }
-    console.log(this);
   },
   watch: {
     valueDetail(val) {