Merge pull request #219 from suyuan32/dev

Dev
suyuan32 · Jun 8, 2024 · fdb7c13 · fdb7c13
2 parents 8c20788 + d0d5c74
commit fdb7c13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
@@ -283,9 +283,7 @@ export function useFormEvents({
  });
  _setDefaultValue(updatedSchema);
 
- schemaRef.value = uniqueBy(schema, (obj) => {
- obj.field;
- });
+ schemaRef.value = uniqueBy(schema, (obj) => obj.field);
  }
 
  function _setDefaultValue(data: FormSchema | FormSchema[]) {

diff --git a/src/views/sys/user/UserDrawer.vue b/src/views/sys/user/UserDrawer.vue
@@ -28,7 +28,7 @@
  const { t } = useI18n();
  const { createMessage } = useMessage();
 
- const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+ const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
  labelWidth: 160,
  baseColProps: { span: 24 },
  layout: 'vertical',
@@ -41,12 +41,13 @@
  setDrawerProps({ confirmLoading: false });
 
  isUpdate.value = !!data?.isUpdate;
-
  if (unref(isUpdate)) {
  setFieldsValue({
  ...data.record,
  });
  }
+
+ updateSchema({ field: 'password', required: !unref(isUpdate) });
  });
 
  const getTitle = computed(() =>