@ebiz/designer-components 0.1.39 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/senior/EbizSData/index.vue

@@ -8,7 +8,7 @@
                 <!-- 表单区域 -->
                 <ebiz-s-form v-if="$slots.form" v-model="formDataValue" ref="formRef" layout="inline" labelAlign="top"
                     @submit="handleSearch" @reset="handleReset">
-                    <slot name="form"></slot>
+                    <slot name="form" :formValue="formDataValue"></slot>
                     <template #buttons>
                         <t-space>
                             <EbizTdesignButton theme="primary" type="submit">搜索</EbizTdesignButton>
@@ -69,7 +69,7 @@ export default {
 
 <script setup>
 import { defineProps, defineEmits, ref, onMounted, computed, defineExpose } from 'vue';
-import { dataService, EbizTableSort, EbizTdesignButton, EbizTdesignCard, EbizPageHeader, EbizSForm } from "../../../index"
+import { dataService, EbizTableSort, EbizTdesignButton, EbizTdesignCard, EbizPageHeader, EbizSForm, EbizDivider } from "../../../index"
 import { Space as TSpace, Pagination as TPagination, Input as TInput, Icon as TIcon } from 'tdesign-vue-next';
 
 const currentPage = ref(1)
@@ -127,7 +127,7 @@ const props = defineProps({
     },
     formData: {
         type: Object,
-        default: () => ({})
+        default: undefined
     },
     labelKey: {
         type: String,
@@ -191,7 +191,7 @@ const computedData = computed(() => {
 })
 
 
-const defaultFormData = ref({ ...props.formData })
+const defaultFormData = ref({ ...JSON.parse(JSON.stringify(props.formData)) })
 const searchValue = ref('')
 
 const loadData = async () => {
@@ -203,7 +203,7 @@ const loadData = async () => {
         page: currentPage.value,
         pagesize: pageSize.value,
         queryParams: {
-            ...params, ...props.defaultParams, ...props.formData
+            ...params, ...props.defaultParams, ...formDataValue.value
         }
     }, props.apiConfig, props.fetchUrl)
 
@@ -241,6 +241,7 @@ const handleReset = (context) => {
         return
     }
 
+    console.log("handleReset", defaultFormData.value)
     emit('update:formData', { ...defaultFormData.value })
     currentPage.value = 1
     setTimeout(() => {
@@ -253,9 +254,18 @@ const onPageChange = () => {
     loadData()
 }
 
+
+const innerFormData = ref({ ...props.formData })
+
 const formDataValue = computed({
-    get: () => props.formData,
+    get: () => {
+        if( props.formData == undefined ){
+            return innerFormData.value
+        }
+        return props.formData
+    },
     set: (value) => {
+        innerFormData.value = value
         emit('update:formData', value)
     }
 })