Merge branch 'master' into refactor

BoBoooooo · Apr 8, 2021 · 61e0d01 · 61e0d01
2 parents aec4028 + e9a10e8
commit 61e0d01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-pro-crud",
-  "version": "0.9.2-13",
+  "version": "0.9.2-14",
   "author": "BoBo<[email protected]>",
   "main": "lib/ProCrud.umd.min.js",
   "files": [

diff --git a/src/component/crud-table/src/CrudTable.vue b/src/component/crud-table/src/CrudTable.vue
@@ -78,8 +78,8 @@
         :width="dialogWidth"
         @btnOnClick="formBtnOnClick"
       >
-        <template #dialogFooter>
-          <slot name="dialogFooter"></slot>
+        <template :slot="slotName" slot-scope="scope" v-for="slotName in Object.keys($scopedSlots)">
+          <slot :name="slotName" :entity="scope.entity"></slot>
         </template>
       </GenerateFormDialog>
     </div>

diff --git a/src/component/crud-table/src/GenerateFormDialog.vue b/src/component/crud-table/src/GenerateFormDialog.vue
@@ -27,7 +27,11 @@
       :entity.sync="entity"
       @btn-on-click="btnOnClick"
       :formTableConfig="formTableConfig"
-    />
+    >
+      <template :slot="slotName" v-for="slotName in Object.keys($scopedSlots)">
+        <slot :name="slotName" :entity="entity"></slot>
+      </template>
+    </GenerateForm>
     <el-row type="flex" justify="end" slot="footer">
       <slot name="dialogFooter"></slot>
       <template v-if="isReadOnly">