Merge pull request #147 from ly525/feature-pass-through-operation-to-…

…default-item-action feat(operation): 支持自定义EditItemDialog.Form的props和fields
vipshop · May 12, 2021 · bd1ddbe · bd1ddbe
2 parents 8a6801a + aeb3214
commit bd1ddbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/actions/item.js b/src/actions/item.js
@@ -13,7 +13,7 @@ const FROM_BLOCK_NAME = `${WRAP_BLOCK_NAME}From`;
  * @param {string} type 'add'|'edit'
  * @param {string} insertType 'dialog'|'after'
  */
-export function commonHandlerItem({ blockConfig, type, resource, insertType, $prevReturn }) {
+export function commonHandlerItem({ blockConfig, type, resource, insertType, $prevReturn, fields, formProps }) {
     return new Promise((resolve, reject) => {
         const $currentBlock = this;
         if (currentParentBlock) {
@@ -52,6 +52,8 @@ export function commonHandlerItem({ blockConfig, type, resource, insertType, $pr
                     type: 'form',
                     ctx: 'edit',
                     resource: resource || this.resource,
+                    fields,
+                    props: formProps,
                     actions: {
                         init({ $prevReturn }) {
                             this.setBlockData($prevReturn);

diff --git a/src/ams/mixins/operation-mixin.js b/src/ams/mixins/operation-mixin.js
@@ -43,7 +43,7 @@ export default {
                 this.$message('已选择的数据项为空');
                 return;
             }
-            this.$block.emitEvent(this.operation.event || this.operationKey);
+            this.$block.emitEvent(this.operation.event || this.operationKey, this.operation);
         }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ export default { @@
                     this.$message('已选择的数据项为空');
                     return;
                 }
-                this.$block.emitEvent(this.operation.event || this.operationKey);
+                this.$block.emitEvent(this.operation.event || this.operationKey, this.operation);
             }
         },
@@ Expand Down @@