Merge branch 'master' into develop

Former-commit-id: 48d03219632340292bdc854f5a5fb09e6067ae91 [formerly 3b7c8564e3251b56d5e628835a5615dff3ce6a20] [formerly 48d03219632340292bdc854f5a5fb09e6067ae91 [formerly 3b7c8564e3251b56d5e628835a5615dff3ce6a20] [formerly 48d03219632340292bdc854f5a5fb09e6067ae91 [formerly 3b7c8564e3251b56d5e628835a5615dff3ce6a20] [formerly 3b7c8564e3251b56d5e628835a5615dff3ce6a20 [formerly 927ecddd1b7981fc64426897ce8f71ecd5a5ff95 [formerly ee2d836b24c736699b1945735b3b47e9b7712259]]]]]
Former-commit-id: d680ab099db9a9029d9f56c1cf520dcef89e478f
Former-commit-id: 31e11a54d6afa630c5b63526d79fbbc80f0d31aa
Former-commit-id: 26690d6a396b6054821b29810db9e9a678411cd4 [formerly caa174ee16edbba049b1d721e3ffb6d32d1951ba]
Former-commit-id: 8856c28825ff8f45513332f9205821fd7a52467e
Former-commit-id: f955a62c2531c2d8204e4313b25c4fa0b0981f82
Former-commit-id: 4c5ca7bc5d18b7dfdeb4745f6384e1d888858dc8
Former-commit-id: ae79e2a310295cfafa0f0d4007c8a6dfc6c53ebb
Former-commit-id: e028a73d827a2aeb407b4be404676aec230ec208
This commit is contained in:
孙昊翔
2019-01-25 09:34:38 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
9a6ae629e8fc58277768e8bd7156ef7ad1f48d73
d2800269002be914baed7f58298e7534789b1e51

View File

@@ -5,7 +5,7 @@ export default `<template>
:columns="columns"
:data="data"
add-title="我的新增"
:form-template="formTemplate"
:add-template="addTemplate"
:form-options="formOptions"
@dialog-open="handleDialogOpen"
@row-add="handleRowAdd"