Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !327 from youge/master

Browse Source
This commit is contained in:
youge 2021-09-22 01:03:43 +00:00 committed by Gitee
commit 7266681001
2 changed files with 1098 additions and 1064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -147,7 +147,18 @@
</el-table>
<!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :visible.sync="open" :fullscreen="fullscreen" width="500px" append-to-body>
<span slot="title">
{{ title }}
<button style="margin-right: 25px" type="button" class="el-dialog__headerbtn" @click="toggleFullScreen">
<i v-show="!fullscreen" class="el-dialog__close el-icon">
<svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#2c2c2c" d="M245.76 409.6H204.8V266.24A61.44 61.44 0 0 1 266.24 204.8H409.6v40.96H266.24a20.48 20.48 0 0 0-20.48 20.48zM409.6 819.2H266.24A61.44 61.44 0 0 1 204.8 757.76V614.4h40.96v143.36a20.48 20.48 0 0 0 20.48 20.48H409.6zM757.76 819.2H614.4v-40.96h143.36a20.48 20.48 0 0 0 20.48-20.48V614.4h40.96v143.36a61.44 61.44 0 0 1-61.44 61.44zM819.2 409.6h-40.96V266.24a20.48 20.48 0 0 0-20.48-20.48H614.4V204.8h143.36A61.44 61.44 0 0 1 819.2 266.24z" /></svg>
</i>
<i v-show="fullscreen" class="el-dialog__close el-icon">
<svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#2c2c2c" d="M348.16 409.6H204.8V368.64h143.36a20.48 20.48 0 0 0 20.48-20.48V204.8h40.96v143.36A61.44 61.44 0 0 1 348.16 409.6zM409.6 819.2H368.64v-143.36a20.48 20.48 0 0 0-20.48-20.48H204.8v-40.96h143.36a61.44 61.44 0 0 1 61.44 61.44zM655.36 819.2h-40.96v-143.36a61.44 61.44 0 0 1 61.44-61.44H819.2v40.96h-143.36a20.48 20.48 0 0 0-20.48 20.48zM819.2 409.6h-143.36A61.44 61.44 0 0 1 614.4 348.16V204.8h40.96v143.36a20.48 20.48 0 0 0 20.48 20.48H819.2z" /></svg>
</i>
</button>
</span>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
@ -319,7 +330,9 @@ export default {
#end
#end
}
},
// dialog全屏
fullscreen: false
};
},
created() {
@ -474,6 +487,10 @@ export default {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** dialog全屏切换 */
toggleFullScreen() {
this.fullscreen = !this.fullscreen
}
}
};

21
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -173,7 +173,18 @@
/>
<!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :visible.sync="open" :fullscreen="fullscreen" width="500px" append-to-body>
<span slot="title">
{{ title }}
<button style="margin-right: 25px" type="button" class="el-dialog__headerbtn" @click="toggleFullScreen">
<i v-show="!fullscreen" class="el-dialog__close el-icon">
<svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#2c2c2c" d="M245.76 409.6H204.8V266.24A61.44 61.44 0 0 1 266.24 204.8H409.6v40.96H266.24a20.48 20.48 0 0 0-20.48 20.48zM409.6 819.2H266.24A61.44 61.44 0 0 1 204.8 757.76V614.4h40.96v143.36a20.48 20.48 0 0 0 20.48 20.48H409.6zM757.76 819.2H614.4v-40.96h143.36a20.48 20.48 0 0 0 20.48-20.48V614.4h40.96v143.36a61.44 61.44 0 0 1-61.44 61.44zM819.2 409.6h-40.96V266.24a20.48 20.48 0 0 0-20.48-20.48H614.4V204.8h143.36A61.44 61.44 0 0 1 819.2 266.24z" /></svg>
</i>
<i v-show="fullscreen" class="el-dialog__close el-icon">
<svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#2c2c2c" d="M348.16 409.6H204.8V368.64h143.36a20.48 20.48 0 0 0 20.48-20.48V204.8h40.96v143.36A61.44 61.44 0 0 1 348.16 409.6zM409.6 819.2H368.64v-143.36a20.48 20.48 0 0 0-20.48-20.48H204.8v-40.96h143.36a61.44 61.44 0 0 1 61.44 61.44zM655.36 819.2h-40.96v-143.36a61.44 61.44 0 0 1 61.44-61.44H819.2v40.96h-143.36a20.48 20.48 0 0 0-20.48 20.48zM819.2 409.6h-143.36A61.44 61.44 0 0 1 614.4 348.16V204.8h40.96v143.36a20.48 20.48 0 0 0 20.48 20.48H819.2z" /></svg>
</i>
</button>
</span>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
@ -386,7 +397,9 @@ export default {
#end
#end
}
},
// dialog全屏
fullscreen: false
};
},
created() {
@ -578,6 +591,10 @@ export default {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
},
/** dialog全屏切换 */
toggleFullScreen() {
this.fullscreen = !this.fullscreen
}
}
};