Skip to content

Commit 3c5d6f3

Browse files
cq-pandacq-panda
committed
完善文档
1 parent 798b760 commit 3c5d6f3

File tree

6 files changed

+280
-2
lines changed

6 files changed

+280
-2
lines changed

‎Vol.Vue/src/extension/system/Sys_Role1.js‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
3+
let extension = {
4+
components: {//动态扩充组件或组件路径
5+
//表单header、content、footer对应位置扩充的组件
6+
gridHeader: '',
7+
gridBody: {
8+
template: '<Alert type="success" show-icon>\
9+
关于TreeTable使用<template slot="desc">\
10+
treetable同样全部代码自动生成，页面生成后设置this.rowKe="xxx" tree主键字段,即可完成树形table配置,具体说明见Sys_Role1.js。(<a target="_blank" href="http://www.volcore.xyz/document/log">升级方式见</a>)</template>\
11+
</Alert>' },
12+
gridFooter: '',
13+
//弹出框(修改、编辑、查看)header、content、footer对应位置扩充的组件
14+
modelHeader: '',
15+
modelBody: '',
16+
modelFooter: ''
17+
},
18+
buttons: [],//扩展的按钮
19+
tableAction:"Sys_Role",
20+
methods: {//事件扩展
21+
onInited () {
22+
this.height = this.height - 80;
23+
},
24+
onInit() {
25+
//设置treetable的唯一值字段(这个字段的值在表里面必须是唯一的)
26+
this.rowKey="Role_Id";
27+
},
28+
/***加载后台数据见Sys_RoleController.cs文件***/
29+
loadTreeChildren(tree, treeNode, resolve) { //加载子节点
30+
let url=`api/role/getTreeTableChildrenData?roleId=${tree.Role_Id}`;
31+
this.http.post(url,{}).then(result=>{
32+
resolve(result.rows)
33+
})
34+
},
35+
/***加载后台数据见Sys_RoleController.cs文件***/
36+
searchBefore(params){//判断加载根节点或子节点
37+
//没有查询条件，默认查询返回所有根节点数据
38+
if (!params.wheres.length) {
39+
params.value=1;
40+
}
41+
return true;
42+
}
43+
}
44+
};
45+
export default extension;

‎Vol.Vue/src/views/document/guide.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</h2>
8585
<ul style="font-family:微软雅黑;font-size:13px;white-space:normal;box-sizing:border-box;-webkit-tap-highlight-color:transparent;margin:0px;padding:5px 30px;">
8686
<li style="padding-left: 26px;list-style: none;">
87-
<span style="color:#E56600;">运行前先看后台appsettings.json配置属性说明</span>
87+
<span style="color:#E56600;">运行前先看后台appsettings.json配置属性说明；(注意修改DbType属性，修改为自己使用的数据库,数据库脚本在DB文件夹下)</span>
8888
</li>
8989
<li style="box-sizing:border-box;-webkit-tap-highlight-color:transparent;margin:0px;padding:0px;">
9090
<span style="line-height:3;font-size:16px;">1、启动后台项目：后端项目路径&nbsp; ../VOL.WebApi，找到dev_run.bat命令点击启动。后台启动</span>

‎Vol.Vue/src/views/document/log.vue‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@ export default {
4444
return {
4545
active: 0,
4646
log: [
47+
{ date: "2021-05-02 15:38:41",desc:"增加treetable使用文档及完善其他文档使用"},
48+
{ date: "2021-05-02 15:27:19",desc:"集成treetable，需要更新(package-lock.json,ViewGrid.vue,methods.js,VolTable.vue);注意更新后需要在前端vol.vue文件夹下重新执行下npm install命令"},
49+
{ date: "2021-05-02 14:11:26",desc:"升级element版本2.4.11"},
50+
{ date: "2021-05-02 00:32:29",desc:"增加代码生成器区间查询(需要更新文件Sys_TableInfoService.cs,methods.js,VolForm.vue,builderData.js)"},
51+
{ date: "2021-05-01 23:59:28",desc:"增加table事件版本兼容处理(freesaber)"},
52+
{ date: "2021-05-01 14:36:42",desc:"完善前端http请求文档(现在可以设置请求超时时间，自定义请求头等信息)"},
53+
{ date: "2021-05-01 14:26:57",desc:"重写http.js、token过期自动刷新机制(需要更新前端http.js,后台Sys_UserController.cs,ApiAuthorizeFilter.cs,HttpRequestMiddleware.cs)"},
54+
{ date: "2021-05-01 14:22:58",desc:"优化文档"},
55+
{ date: "2021-05-01 14:22:34",desc:"优化dapper"},
56+
{ date: "2021-04-24 23:30:47",desc:"修复多文件分批上传url路径指向错误的问题(freesaber)"},
57+
{ date: "2021-04-23 00:13:50",desc:"修复mysql数据库MySqlBulkLoader批量插入在linux上数据丢失的问题"},
58+
{ date: "2021-04-20 23:10:40",desc:"封装Dapper dynamic查询"},
59+
{ date: "2021-04-20 23:10:01",desc:"增加EF AddAsync封装"},
60+
{ date: "2021-04-19 21:42:37",desc:"优化连续添加对返的状态的判断"},
4761
{ date: "2021-04-18 20:05:49",desc:"增加新建时设置表单select下拉框默认选中值文档及其他文档"},
4862
{ date: "2021-04-18 19:32:59",desc:"增加EF多表关联、获取用户所有子角色文档"},
4963
{ date: "2021-04-18 19:19:35",desc:"加深table表头字段颜色"},

‎Vol.Vue/src/views/order/SellOrder.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
{field:'Order_Id',title:'订单Id',type:'string',width:90,hidden:true,readonly:true,require:true,align:'left'},
7474
{field:'ProductName',title:'商品名称',type:'string',bind:{ key:'pn',data:[]},width:150,edit:{type:'select'},require:true,align:'left',sortable:true},
7575
{field:'MO',title:'批次',type:'string',width:100,edit:{type:''},require:true,align:'left'},
76-
{field:'Qty',title:'数量',type:'int',width:90,edit:{type:'select'},require:true,align:'left'},
76+
{field:'Qty',title:'数量',type:'int',width:90,edit:{type:''},require:true,align:'left'},
7777
{field:'Weight',title:'重量',type:'decimal',width:90,edit:{type:''},align:'left'},
7878
{field:'Remark',title:'备注',type:'string',width:120,edit:{type:''},align:'left'},
7979
{field:'CreateID',title:'CreateID',type:'int',width:80,hidden:true,align:'left'},

‎Vol.Vue/src/views/system/Sys_Role1.vue‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!--
2+
*Author：jxx
3+
*Contact：[email protected]
4+
*代码由框架生成,任何更改都可能导致被代码生成器覆盖
5+
*业务请在@/extension/system/Sys_Role.js此处编写
6+
-->
7+
<template>
8+
<div>
9+
<view-grid :columns="columns"
10+
:detail="detail"
11+
:editFormFields="editFormFields"
12+
:editFormFileds="editFormFields"
13+
:editFormOptions="editFormOptions"
14+
:searchFormFields="searchFormFields"
15+
:searchFormFileds="searchFormFields"
16+
:searchFormOptions="searchFormOptions"
17+
:table="table"
18+
:extend="extend">
19+
</view-grid>
20+
</div>
21+
</template>
22+
23+
<script>
24+
import extend from "@/extension/system/Sys_Role1.js";
25+
import ViewGrid from "@/components/basic/ViewGrid.vue";
26+
var vueParam = {
27+
components: {
28+
ViewGrid
29+
},
30+
data () {
31+
return {
32+
table: {
33+
key: 'Role_Id',
34+
footer: "Foots",
35+
cnName: '角色管理',
36+
name: 'Sys_Role',
37+
url: "/Sys_Role/",
38+
sortName: "Role_Id"
39+
},
40+
extend: extend,
41+
editFormFields: { "ParentId": [], "RoleName": "", "DeptName": "", "Enable": "", "Creator": "", "CreateDate": "", "Modifier": "", "ModifyDate": "" },
42+
editFormOptions: [[{ "dataKey": "tree_roles", "data": [], "title": "父级ID", "required": true, "field": "ParentId", "type": "cascader" },
43+
{ "title": "角色名称", "required": true, "field": "RoleName" }],
44+
[{ "title": "部门名称", "field": "DeptName" },
45+
{ "dataKey": "enable", "data": [], "title": "是否启用", "field": "Enable", "type": "switch" }],
46+
[{ "title": "创建人", "field": "Creator", "disabled": true },
47+
{ "title": "创建时间", "field": "CreateDate", "disabled": true, "type": "datetime" }],
48+
[{ "title": "修改人", "field": "Modifier", "disabled": true },
49+
{ "title": "修改时间", "field": "ModifyDate", "disabled": true }]],
50+
searchFormFields: { "ParentId": [], "RoleName": "", "DeptName": "", "Enable": "", "CreateDate": "", "ModifyDate": "" },
51+
searchFormOptions: [[{ "title": "角色名称", "field": "RoleName", "type": "text" }, { "title": "部门名称", "field": "DeptName", "type": "text" }, { "dataKey": "enable", "data": [], "title": "是否启用", "field": "Enable", "type": "select" }], [{ "dataKey": "tree_roles", "data": [], "title": "父级ID", "field": "ParentId", "type": "cascader" }, { "title": "创建时间", "field": "CreateDate", "type": "datetime" }, { "title": "修改时间", "field": "ModifyDate", "type": "datetime" }]],
52+
columns: [{ field: 'Role_Id', title: '角色ID', type: 'int', width: 70, readonly: true, require: true, align: 'left', sortable: true },
53+
//{ field: 'ParentId', title: '父级ID', type: 'int', bind: { key: 'tree_roles', data: [] }, width: 70, require: true, align: 'left' },
54+
{ field: 'RoleName', title: '角色名称', type: 'string', link: true, width: 90, require: true, align: 'left' },
55+
{ field: 'Dept_Id', title: '部门ID', type: 'int', width: 90, hidden: true, align: 'left' },
56+
{ field: 'DeptName', title: '部门名称', type: 'string', width: 90, align: 'left' },
57+
{ field: 'Enable', title: '是否启用', type: 'byte', bind: { key: 'enable', data: [] }, width: 90, align: 'left' },
58+
{ field: 'OrderNo', title: '排序', type: 'int', width: 90, hidden: true, align: 'left' },
59+
{ field: 'Creator', title: '创建人', type: 'string', width: 130, readonly: true, align: 'left' },
60+
{ field: 'CreateDate', title: '创建时间', type: 'datetime', width: 90, readonly: true, align: 'left', sortable: true },
61+
{ field: 'Modifier', title: '修改人', type: 'string', width: 130, readonly: true, align: 'left' },
62+
{ field: 'ModifyDate', title: '修改时间', type: 'datetime', width: 90, readonly: true, align: 'left', sortable: true }],
63+
detail: {
64+
cnName: "#detailCnName",
65+
columns: [],
66+
sortName: "",
67+
key: ""
68+
}
69+
};
70+
}
71+
};
72+
export default vueParam;
73+
</script>

‎Vol.Vue/src/views/treeTable/TreeTable3.vue‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
<template>
2+
<div class="container">
3+
<Alert type="success" style=" margin: 20px 20px 0 20px;" show-icon>
4+
treetable
5+
<div slot="desc">
6+
需要2021.05.02更新后才能使用,(<a target="_blank" href="http://www.volcore.xyz/document/log">升级方式见</a>)
7+
</div>
8+
</Alert>
9+
<!-- 查询配置 -->
10+
<div style="padding: 0px 20px">
11+
<VolHeader
12+
icon="md-apps"
13+
text="TreeTable"
14+
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
15+
>
16+
<div slot="content"></div>
17+
<slot>
18+
<div style="text-align: right">
19+
<Button type="primary" @click="search"
20+
>查询</Button
21+
>
22+
<Button type="success" style="margin-left: 10px" @click="getRows">获取选中的行</Button>
23+
</div>
24+
</slot>
25+
</VolHeader>
26+
<vol-table
27+
ref="table"
28+
:loadKey="true"
29+
row-key="Role_Id"
30+
:columns="columns"
31+
:pagination-hide="false"
32+
:max-height="450"
33+
url="/api/Sys_Role/getPageData"
34+
:index="true"
35+
:loadTreeChildren="loadTreeChildren"
36+
@loadBefore="loadTableBefore"
37+
></vol-table>
38+
</div>
39+
</div>
40+
</template>
41+
<script>
42+
import VolTable from "@/components/basic/VolTable.vue";
43+
import VolHeader from "@/components/basic/VolHeader.vue";
44+
export default {
45+
components: { VolTable, VolHeader },
46+
created() {},
47+
data() {
48+
return {
49+
columns: [
50+
{
51+
field: "Role_Id",
52+
title: "角色ID",
53+
type: "int",
54+
width: 70,
55+
readonly: true,
56+
require: true,
57+
align: "left",
58+
sortable: true,
59+
},
60+
{
61+
field: "RoleName",
62+
title: "角色名称",
63+
type: "string",
64+
link: true,
65+
width: 90,
66+
require: true,
67+
align: "left",
68+
},
69+
{
70+
field: "Dept_Id",
71+
title: "部门ID",
72+
type: "int",
73+
width: 90,
74+
hidden: true,
75+
align: "left",
76+
},
77+
{
78+
field: "DeptName",
79+
title: "部门名称",
80+
type: "string",
81+
width: 90,
82+
align: "left",
83+
},
84+
{
85+
field: "Enable",
86+
title: "是否启用",
87+
type: "byte",
88+
bind: { key: "enable", data: [] },
89+
width: 90,
90+
align: "left",
91+
},
92+
{
93+
field: "OrderNo",
94+
title: "排序",
95+
type: "int",
96+
width: 90,
97+
hidden: true,
98+
align: "left",
99+
},
100+
{
101+
field: "Creator",
102+
title: "创建人",
103+
type: "string",
104+
width: 130,
105+
readonly: true,
106+
align: "left",
107+
},
108+
{
109+
field: "CreateDate",
110+
title: "创建时间",
111+
type: "datetime",
112+
width: 90,
113+
readonly: true,
114+
align: "left",
115+
sortable: true,
116+
},
117+
],
118+
};
119+
},
120+
methods: {
121+
loadTableBefore(params) {
122+
//Sys_RoleController中始终只加载根节点数据
123+
params.value = 1;
124+
return true;
125+
},
126+
loadTreeChildren(tree, treeNode, resolve) {
127+
//加载子节点数据
128+
let url = `api/role/getTreeTableChildrenData?roleId=${tree.Role_Id}`;
129+
this.http.post(url, {}).then((result) => {
130+
resolve(result.rows);
131+
});
132+
},
133+
search() {
134+
this.$refs.table.load();
135+
},
136+
getRows() {
137+
let rows = this.$refs.table.getSelected();
138+
if (rows.length == 0) {
139+
return this.$message.error("请先选中行1");
140+
}
141+
let text = "当前选中的行数据：" + JSON.stringify(rows);
142+
this.$Message.info(text);
143+
},
144+
},
145+
};
146+
</script>

0 commit comments

Comments
 (0)