@ddwl/ddwl-ui 1.4.3 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddwl/ddwl-ui",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "private": false,
   "main": "dist/index.common.js",
   "style": "dist/index.css",

package/src/packages/search-form/index.vue

@@ -151,11 +151,12 @@ export default {
      * @description: 查询
      */
     async search() {
-      this.$emit('search')
+      const params = cloneDeep(this.form)
+      this.$emit('search', params)
       if (this.searchData) {
         try {
           this.searchLoading = true
-          await this.searchData({ pageNum: 1 }, this.form)
+          await this.searchData({ pageNum: 1 }, params)
           this.searchLoading = false
         } catch (e) {
           this.searchLoading = false
@@ -167,10 +168,11 @@ export default {
      */
     async reset() {
       this.form = cloneDeep(this.initForm)
-      this.$emit('search')
+      const params = cloneDeep(this.form)
+      this.$emit('search', params)
       if (this.searchData) {
         this.resetLoading = true
-        await this.searchData({ pageNum: 1 }, this.form)
+        await this.searchData({ pageNum: 1 }, params)
         this.resetLoading = false
       }
     },

package/src/packages/table/index.vue

@@ -221,6 +221,7 @@ export default {
       !this.staticPaging &&
       (this.requestConfig.autoRequest || this.requestConfig.autoRequest === undefined)
     ) {
+      this.$emit('search', this.form)
       this.search()
     }
   },
@@ -256,10 +257,12 @@ export default {
         typeof this.requestConfig.params === 'function'
           ? this.requestConfig.params(this.form)
           : this.requestConfig.params
-      const { data } = await this.requestConfig.api({
-        ...defaultParams,
-        ...params
-      })
+      params = {
+        ...params,
+        ...defaultParams
+      }
+      this.$emit('get-data', params)
+      const { data } = await this.requestConfig.api(params)
       this.total = data.total
       let listData = data.list || []
       if (this.requestConfig.props) {