@ddwl/ddwl-ui 1.4.2 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddwl/ddwl-ui",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "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/search-table/index.vue

@@ -3,20 +3,21 @@
   <div class="d-table-search-wrap">
     <search-form
       v-model="form"
+      v-bind="$attrs"
       :config="config.searchConfig"
       :search-data="searchData"
-      v-bind="$attrs"
       v-on="$listeners"
     >
       <slot />
     </search-form>
     <d-table
       v-if="config.columns.length"
+      v-bind="$attrs"
       ref="dTable"
-      :request-config="requestConfig"
+      :request-config="config.requestConfig"
       :columns="config.columns"
       :data="data"
-      v-bind="$attrs"
+      :form="form"
       class="d-table-wrap"
       v-on="$listeners"
     />
@@ -24,7 +25,6 @@
 </template>
 
 <script>
-import { cloneDeep } from 'lodash'
 import SearchForm from '../search-form/index.vue'
 import DTable from '../table/index.vue'
 
@@ -50,21 +50,7 @@ export default {
       form: {}
     }
   },
-  computed: {
-    requestConfig() {
-      const requestConfig = this.config.requestConfig
-      return {
-        ...requestConfig,
-        params:
-          typeof requestConfig.params === 'function'
-            ? requestConfig.params(cloneDeep(this.form)) // 处理自定义参数
-            : {
-                ...this.form,
-                ...requestConfig.params
-              }
-      }
-    }
-  },
+  computed: {},
   created() {
     this.createFormBind()
   },

package/src/packages/table/index.vue

@@ -81,6 +81,10 @@ export default {
   name: 'DTable',
   components: { ...modules, ColumnRender },
   props: {
+    form: {
+      type: Object,
+      default: () => ({})
+    },
     data: {
       type: Array,
       default: () => []
@@ -250,7 +254,7 @@ export default {
     async getData(params) {
       const defaultParams =
         typeof this.requestConfig.params === 'function'
-          ? this.requestConfig.params()
+          ? this.requestConfig.params(this.form)
           : this.requestConfig.params
       const { data } = await this.requestConfig.api({
         ...defaultParams,