From f62043b1fca82234e04aa04629ba4bbcc624b0ee Mon Sep 17 00:00:00 2001
From: zhang <zwtvip@qq.com>
Date: Thu, 23 Nov 2023 13:46:46 +0800
Subject: [PATCH] fix(DatePicker): date show is wrong and setup script
 defineExpose (#3324)

* fix(useFormEvents): some function is lost in componentsProps

* fix(useFormEvents): some function is lost in componentsProps

* fix(useFormEvents): some function is lost in componentsProps

* fix(DatePicker): date show is wrong

* fix(useFormEvents): some function is lost in componentsProps

* fix(useFormEvents): some function is lost in componentsProps

* fix(useFormEvents): some function is lost in componentsProps

* fix(DatePicker): date show is wrong

* fix(DatePicker): date show is wrong
---
 src/components/Form/src/BasicForm.vue         |  2 +-
 .../Form/src/hooks/useFormEvents.ts           | 25 ++++++++++++++++++-
 src/components/Scrollbar/src/Scrollbar.vue    |  4 +++
 src/components/Table/src/BasicTable.vue       |  2 +-
 .../lang/zh-CN/antdLocale/DatePicker.json     |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 612b2871..2e49885b 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -294,7 +294,7 @@
   );
 
   defineExpose({
-    setProps,
+    ...formActionType,
   });
 
   onMounted(() => {
diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index ea3b711b..6982c611 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -123,7 +123,10 @@ export function useFormEvents({
       const { componentProps } = schema || {};
       let _props = componentProps as any;
       if (typeof componentProps === 'function') {
-        _props = _props({ formModel: unref(formModel), formActionType: unref(formElRef) });
+        _props = _props({
+          formModel: unref(formModel),
+          formActionType,
+        });
       }
 
       const constructValue = tryConstructArray(key, values) || tryConstructObject(key, values);
@@ -338,6 +341,10 @@ export function useFormEvents({
     return handleFormValues(values);
   }
 
+  async function setProps(formProps: Partial<FormProps>): Promise<void> {
+    await unref(formElRef)?.setProps(formProps);
+  }
+
   async function validate(nameList?: NamePath[] | false | undefined) {
     let _nameList: any;
     if (nameList === undefined) {
@@ -380,6 +387,22 @@ export function useFormEvents({
     }
   }
 
+  const formActionType: Partial<FormActionType> = {
+    getFieldsValue,
+    setFieldsValue,
+    resetFields,
+    updateSchema,
+    resetSchema,
+    setProps,
+    removeSchemaByField,
+    appendSchemaByField,
+    clearValidate,
+    validateFields,
+    validate,
+    submit: handleSubmit,
+    scrollToField: scrollToField,
+  };
+
   return {
     handleSubmit,
     clearValidate,
diff --git a/src/components/Scrollbar/src/Scrollbar.vue b/src/components/Scrollbar/src/Scrollbar.vue
index 1926ed9b..db8d7a18 100644
--- a/src/components/Scrollbar/src/Scrollbar.vue
+++ b/src/components/Scrollbar/src/Scrollbar.vue
@@ -101,6 +101,10 @@
     },
   );
 
+  defineExpose({
+    wrap,
+  });
+
   onMounted(() => {
     if (props.native) return;
     nextTick(update);
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 428dd607..41cf7ca9 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -320,7 +320,7 @@
 
   emit('register', tableAction, formActions);
 
-  defineExpose({ tableAction });
+  defineExpose({ ...tableAction });
 </script>
 <style lang="less">
   @border-color: #cecece4d;
diff --git a/src/locales/lang/zh-CN/antdLocale/DatePicker.json b/src/locales/lang/zh-CN/antdLocale/DatePicker.json
index b088fb5f..e6ea6bbe 100644
--- a/src/locales/lang/zh-CN/antdLocale/DatePicker.json
+++ b/src/locales/lang/zh-CN/antdLocale/DatePicker.json
@@ -1,6 +1,6 @@
 {
   "lang": {
-    "shortWeekDays": ["一", "二", "三", "四", "五", "六", "日"],
+    "shortWeekDays": ["日","一", "二", "三", "四", "五", "六"],
     "shortMonths": [
       "1月",
       "2月",