@ddwl/ddwl-ui 1.4.8 → 1.4.10

package/package.json

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

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

@@ -16,16 +16,16 @@
           <form-item v-model="form[item.prop]" :config="item" />
         </div>
       </el-col>
-      <el-col :span="hiddenIndex === list.length || expend ? emptySpan : 0" style="height: 68px">
+      <el-col :span="hiddenIndex === list.length || expand ? emptySpan : 0" style="height: 68px">
         <span />
       </el-col>
-      <el-col v-if="hasSlot && expend && !suffixSlot" :span="24 - submitSpan" class="mb16">
+      <el-col v-if="hasSlot && expand && !suffixSlot" :span="24 - submitSpan" class="mb16">
         <slot />
       </el-col>
       <el-col v-if="config.length" :span="submitSpan">
         <div
           :style="{
-            'margin-top': hasSlot && expend && !suffixSlot ? '0px' : '24px'
+            'margin-top': hasSlot && expand && !suffixSlot ? '0px' : '24px'
           }"
           class="d-search-form-btn"
         >
@@ -33,13 +33,13 @@
           <el-button :disabled="searchLoading" @click="reset"> 重置 </el-button>
           <el-button
             v-if="list.length > hiddenIndex"
-            class="expend-btn"
-            :class="`el-icon-arrow-${expend ? 'up' : 'down'}`"
+            class="expand-btn"
+            :class="`el-icon-arrow-${expand ? 'up' : 'down'}`"
             @click="changeStatus"
           />
         </div>
       </el-col>
-      <el-col v-if="hasSlot && (!expend || suffixSlot)" :span="20" class="mb16">
+      <el-col v-if="hasSlot && (!expand || suffixSlot)" :span="20" class="mb16">
         <slot />
       </el-col>
     </el-row>
@@ -84,6 +84,10 @@ export default {
     buttonSpan: {
       default: 0,
       type: Number
+    },
+    defaultExpand: {
+      default: false,
+      type: Boolean
     }
   },
   data() {
@@ -92,7 +96,7 @@ export default {
       list: [],
       hiddenIndex: 0,
       emptySpan: 0,
-      expend: false,
+      expand: false,
       searchLoading: false,
       // 判断是否有插槽节点，目前只在组件初始化完成时判断
       hasSlot: false,
@@ -116,7 +120,7 @@ export default {
     },
     showCol() {
       return (index) => {
-        return this.expend || index < this.hiddenIndex
+        return this.expand || index < this.hiddenIndex
       }
     }
   },
@@ -140,6 +144,7 @@ export default {
     }
   },
   created() {
+    this.expand = this.defaultExpand
     this.initForm = cloneDeep(this.value)
     this.$nextTick(() => {
       this.hasSlot = !!(this.$slots.default && this.$slots.default.length)
@@ -180,8 +185,8 @@ export default {
      * @description: 展开/收起
      */
     changeStatus() {
-      this.expend = !this.expend
-      this.$emit('expand-change', this.expend)
+      this.expand = !this.expand
+      this.$emit('expand-change', this.expand)
     },
     calcSpan() {
       let hiddenIndex = 1
@@ -239,7 +244,7 @@ export default {
   &-overflow {
     margin-top: 24px;
   }
-  .expend-btn {
+  .expand-btn {
     padding: 4px 8px;
   }
   .d-search-item {

package/src/packages/table/index.vue

@@ -256,17 +256,14 @@ export default {
     async getData(params) {
       const defaultParams =
         typeof this.requestConfig.params === 'function'
-          ? this.requestConfig.params(this.form)
+          ? this.requestConfig.params({ ...params, ...this.form })
           : {
+              ...params,
               ...this.form,
               ...this.requestConfig.params
             }
-      params = {
-        ...params,
-        ...defaultParams
-      }
-      this.$emit('get-data', params)
-      const { data } = await this.requestConfig.api(params)
+      this.$emit('get-data', defaultParams)
+      const { data } = await this.requestConfig.api(defaultParams)
       this.total = data.total
       let listData = data.list || []
       if (this.requestConfig.props) {