open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Element升级

Browse Source 
Former-commit-id: c927279ce250dbdd2200b30e6e7a862a86c45cf1
master
wangbingit@outlook.com 5 years ago
parent 5dadea8173
commit eb5f70683a
12 changed files with 270 additions and 313 deletions
Show Stats Download Patch File Download Diff File

10
src/main/resources/modules/SpringBoot/java/module/wsys/ent/ResTree.java
Unescape View File

@ -16,8 +16,6 @@ public class ResTree extends Res {
private String value; private String value;
private boolean disabled;
private List<ResTree> children; private List<ResTree> children;
public String getLabel() { public String getLabel() {
@ -36,14 +34,6 @@ public class ResTree extends Res {
this.value = value; this.value = value;
} }
public boolean getDisabled() {
return disabled;
}
public void setDisabled(boolean disabled) {
this.disabled = disabled;
}
public List<ResTree> getChildren() { public List<ResTree> getChildren() {
return children; return children;
} }

1
src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ResManagerImpl.java
Unescape View File

@ -238,7 +238,6 @@ public class ResManagerImpl implements ResManager {
tree.setValid(next.getValid()); tree.setValid(next.getValid());
tree.setRowVersion(next.getRowVersion()); tree.setRowVersion(next.getRowVersion());
tree.setLabel(next.getResName()); tree.setLabel(next.getResName());
tree.setDisabled(next.getFree());
allMap.put(tree.getResCode(), tree); allMap.put(tree.getResCode(), tree);
iterator.remove(); iterator.remove();

9
src/main/resources/modules/SpringBoot/resources/static/css/base.css
Unescape View File

@ -632,6 +632,15 @@ code {
box-shadow: 0 1px 6px rgba(0, 0, 0, .2); box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
} }
.el-drawer{/* 修复抽屉无法滚动 */
overflow: auto;
height: 100%;
}
.el-drawer .el-drawer__body{/* 修复抽屉内容子类继承height失效维内托 */
height: calc(100% - 76px);
}
/* 带有固定title布局,title保持固定*/ /* 带有固定title布局,title保持固定*/
.wb-layout-title-fix { .wb-layout-title-fix {
width: 100%; width: 100%;

2
src/main/resources/modules/SpringBoot/resources/static/dist/index.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/modules/SpringBoot/resources/static/dist/index.min.js vendored
View File

File diff suppressed because one or more lines are too long

516
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
Unescape View File

@ -1,217 +1,172 @@
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card class="box-card"> <el-card class="box-card">
<el-tabs :value="'list'"> <el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
<el-tab-pane label="列表展示" name="list"> <el-form-item label="资源代码" prop="resCode">
<span slot="label"><i class="el-icon-s-operation"></i>列表展示</span> <el-input v-model="vm.resCode" clearable size="mini" placeholder="请输入资源代码"></el-input>
</el-form-item>
<el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px"> <el-form-item label="资源名称" prop="resName">
<el-form-item label="资源代码" prop="resCode"> <el-input v-model="vm.resName" clearable size="mini" placeholder="请输入资源名称"></el-input>
<el-input v-model="vm.resCode" clearable size="mini" placeholder="请输入资源代码"></el-input> </el-form-item>
</el-form-item> <el-form-item label="资源类型" prop="resType">
<el-form-item label="资源名称" prop="resName"> <el-select v-model="vm.resType" clearable size="mini" filterable placeholder="请输入资源类型">
<el-input v-model="vm.resName" clearable size="mini" placeholder="请输入资源名称"></el-input> <el-option key="WEB" label="网页" value="WEB"></el-option>
</el-form-item> <el-option key="API" label="终端" value="API"></el-option>
<el-form-item label="资源类型" prop="resType"> </el-select>
<el-select v-model="vm.resType" clearable size="mini" filterable placeholder="请输入资源类型"> </el-form-item>
<el-option key="WEB" label="网页" value="WEB"></el-option> <el-form-item label="资源内容" prop="resValue">
<el-option key="API" label="终端" value="API"></el-option> <el-input v-model="vm.resValue" clearable size="mini" placeholder="请输入资源内容"></el-input>
</el-select> </el-form-item>
</el-form-item> <el-form-item label="是否免费" prop="free">
<el-form-item label="资源内容" prop="resValue"> <el-radio-group v-model="vm.free" clearable size="mini">
<el-input v-model="vm.resValue" clearable size="mini" placeholder="请输入资源内容"></el-input> <el-radio :label="true">是</el-radio>
</el-form-item> <el-radio :label="false">否</el-radio>
<el-form-item label="是否免费" prop="free"> </el-radio-group>
<el-radio-group v-model="vm.free" clearable size="mini"> </el-form-item>
<el-radio :label="true">是</el-radio> <el-form-item label="是否有效" prop="valid">
<el-radio :label="false">否</el-radio> <el-radio-group v-model="vm.valid" clearable size="mini">
</el-radio-group> <el-radio :label="true">是</el-radio>
</el-form-item> <el-radio :label="false">否</el-radio>
<el-form-item label="是否有效" prop="valid"> </el-radio-group>
<el-radio-group v-model="vm.valid" clearable size="mini"> </el-form-item>
<el-radio :label="true">是</el-radio> <el-form-item label="开始日期" prop="startDate">
<el-radio :label="false">否</el-radio> <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime"
</el-radio-group> value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="开始日期" prop="startDate"> <el-form-item label="结束日期" prop="endDate">
<el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime"
</el-form-item> value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-form-item label="结束日期" prop="endDate"> </el-form-item>
<el-date-picker v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-form-item>
</el-form-item> <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
<el-form-item> <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置
<el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button> </el-button>
<el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置 </el-form-item>
</el-button> </el-form>
</el-form-item> </el-card>
</el-form> <el-card class="box-card">
<el-row>
<el-divider><i class="el-icon-search"></i></el-divider> <el-col :span="12">
<el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
<el-row>
<el-col :span="12">
<el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
<el-button type="warning" size="mini" icon="el-icon-download" @click="onExport">导出</el-button>
</el-col>
<el-col :span="12">
<el-button-group style="float: right;">
<el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
<el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="Excel导入" placement="bottom">
<el-button size="mini" icon="el-icon-upload2" @click="onImport"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">
<el-button size="mini" icon="el-icon-delete" @click="onBitchDelete"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="刷新" placement="bottom"> <el-button type="warning" size="mini" icon="el-icon-download" @click="onExport">导出</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="onFind"></el-button>
</el-tooltip>
</el-button-group>
</el-col>
</el-row>
<el-table <el-button type="warning" size="mini" icon="el-icon-share" @click="treeShow = true">树状</el-button>
@selection-change="onSelectionChange" </el-col>
empty-text="无数据"
:stripe="true"
:data="result"
size="mini">
<el-table-column
align="center"
type="selection"
width="45">
</el-table-column>
<el-table-column
align="center"
width="140"
prop="id"
label="主键">
</el-table-column>
<el-table-column
align="center"
width="100"
prop="valid"
label="是否有效">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" type="success" v-if="scope.row.valid">有效</el-tag>
<el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.valid">无效</el-tag>
</template>
</el-table-column>
<el-table-column
align="center"
min-width="120"
prop="resCode"
label="资源代码">
</el-table-column>
<el-table-column
align="center"
min-width="150"
prop="resName"
label="资源名称">
</el-table-column>
<el-table-column
align="center"
min-width="100"
prop="resType"
label="资源类型">
</el-table-column>
<el-table-column
align="center"
min-width="150"
prop="resValue"
label="资源内容">
</el-table-column>
<el-table-column
align="center"
min-width="100"
prop="free"
label="是否免费">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" type="success" v-if="scope.row.free">免费</el-tag>
<el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.free">授权</el-tag>
</template>
</el-table-column>
<el-table-column
align="center"
min-width="140"
prop="createTime"
label="创建时间">
</el-table-column>
<el-table-column
align="center"
width="120"
fixed="right"
label="操作">
<template slot-scope="scope">
<wb-dropdown :arg="scope.row">
<wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
<wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
</wb-dropdown>
</template>
</el-table-column>
</el-table>
<el-pagination <el-col :span="12">
background <el-button-group style="float: right;">
v-if="vm.totalCount > vm.pageSize" <el-tooltip effect="dark" content="Excel模板下载" placement="bottom">
style="margin-top: 10px" <el-button size="mini" icon="el-icon-date" @click="onTemplate"></el-button>
@current-change="onPageChange" </el-tooltip>
@size-change="onPageSizeChange"
:current-page="vm.pageNumber"
:page-size="vm.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="vm.totalCount">
</el-pagination>
</el-tab-pane> <el-tooltip effect="dark" content="Excel导入" placement="bottom">
<el-tab-pane label="树状展示" name="tree"> <el-button size="mini" icon="el-icon-upload2" @click="onImport"></el-button>
<span slot="label"><i class="el-icon-share"></i>树状展示</span> </el-tooltip>
<el-row> <el-tooltip effect="dark" content="批量删除" placement="bottom">
<el-col :span="12"> <el-button size="mini" icon="el-icon-delete" @click="onBitchDelete"></el-button>
<el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button> </el-tooltip>
<el-button type="warning" size="mini" icon="el-icon-edit" @click="onCreate">前缀修改</el-button> <el-tooltip effect="dark" content="刷新" placement="bottom">
</el-col> <el-button size="mini" icon="el-icon-refresh" @click="onFind"></el-button>
<el-col :span="12"> </el-tooltip>
<el-button-group style="float: right;"> </el-button-group>
<el-tooltip effect="dark" content="批量删除" placement="bottom"> </el-col>
<el-button size="mini" icon="el-icon-delete" @click="onBitchDelete"></el-button> </el-row>
</el-tooltip>
<el-tooltip effect="dark" content="刷新" placement="bottom"> <el-table
<el-button size="mini" icon="el-icon-refresh" @click="onLoadTree"></el-button> class="data"
</el-tooltip> @selection-change="onSelectionChange"
</el-button-group> empty-text="无数据"
</el-col> :stripe="true"
</el-row> :data="result"
size="mini">
<el-table-column
align="center"
type="selection"
width="45">
</el-table-column>
<el-table-column
align="center"
width="140"
prop="id"
label="主键">
</el-table-column>
<el-table-column
align="center"
width="100"
prop="valid"
label="是否有效">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" type="success" v-if="scope.row.valid">有效</el-tag>
<el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.valid">无效</el-tag>
</template>
</el-table-column>
<el-table-column
align="center"
min-width="120"
prop="resCode"
label="资源代码">
</el-table-column>
<el-table-column
align="center"
min-width="150"
prop="resName"
label="资源名称">
</el-table-column>
<el-table-column
align="center"
min-width="100"
prop="resType"
label="资源类型">
</el-table-column>
<el-table-column
align="center"
min-width="150"
prop="resValue"
label="资源内容">
</el-table-column>
<el-table-column
align="center"
min-width="100"
prop="free"
label="是否免费">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" type="success" v-if="scope.row.free">免费</el-tag>
<el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.free">授权</el-tag>
</template>
</el-table-column>
<el-table-column
align="center"
min-width="140"
prop="createTime"
label="创建时间">
</el-table-column>
<el-table-column
align="center"
width="120"
fixed="right"
label="操作">
<template slot-scope="scope">
<wb-dropdown :arg="scope.row">
<wb-dropdown-item value="编辑" icon="el-icon-edit" @click="onEdit"></wb-dropdown-item>
<wb-dropdown-item value="删除" icon="el-icon-delete" @click="onDelete"></wb-dropdown-item>
</wb-dropdown>
</template>
</el-table-column>
</el-table>
<el-tree <el-pagination
style="margin-top: 10px" background
:data="treeData" v-if="vm.totalCount > vm.pageSize"
node-key="resCode" style="margin-top: 10px"
ref="tree" @current-change="onPageChange"
show-checkbox @size-change="onPageSizeChange"
default-expand-all :current-page="vm.pageNumber"
:filter-node-method="filterTree" :page-size="vm.pageSize"
:expand-on-click-node="false"> layout="total, sizes, prev, pager, next, jumper"
<div class="tree" slot-scope="{ node, data }"> :total="vm.totalCount">
<span> </el-pagination>
<el-link type="success" @click="onTreeCreate(data)">新增</el-link>
<el-link type="danger" @click="onDelete(data)">删除</el-link>
{{ data.resName }}
<span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.resCode}}]</span>
<span style="color: #ff0000" v-if="data.free">[免费]</span>
</span>
</div>
</el-tree>
</el-tab-pane>
</el-tabs>
</el-card> </el-card>
<el-dialog <el-dialog
@ -260,6 +215,53 @@
<el-button size="mini" type="primary" @click="onSave">保存</el-button> <el-button size="mini" type="primary" @click="onSave">保存</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-drawer
direction="ltr"
:visible.sync="treeShow"
:close-on-click-modal="false"
:close-on-press-escape="true"
:modal-append-to-body="true"
:append-to-body="true"
@opened="onTreeOpened"
size="600px">
<el-page-header slot="title" @back="treeShow = false" content="资源树状展示"></el-page-header>
<el-container style="height:100%">
<el-header>
<el-input
size="mini"
placeholder="输入资源名称、资源代码或资源值"
prefix-icon="el-icon-search"
v-model="treeFilter">
</el-input>
</el-header>
<el-main style="height:100%;padding: 0 20px 20px 20px;">
<el-tree
:data="treeData"
node-key="resCode"
ref="tree"
show-checkbox
default-expand-all
:filter-node-method="onTreeFilter"
:expand-on-click-node="false">
<div class="tree" slot-scope="{ node, data }">
<span>
{{ data.resName }}
<span style="color: #409EFF" @click="onTreeEdit(data)">[{{data.resCode}}]</span>
<span style="color: #ff0000" v-if="data.free">[免费]</span>
</span>
<span>
<el-link type="success" @click="onTreeCreate(data)">新增</el-link>
<el-link type="danger" @click="onDelete(data)">删除</el-link>
</span>
</div>
</el-tree>
</el-main>
</el-container>
</el-drawer>
</div> </div>
<style> <style>
.tree { .tree {
@ -327,6 +329,8 @@
{required: true, message: '是否有效不能为空', trigger: 'blur'}, {required: true, message: '是否有效不能为空', trigger: 'blur'},
], ],
}, },
treeShow: false,
treeFilter: '',
treeData: [] treeData: []
}, },
methods: { methods: {
@ -334,7 +338,7 @@
this.form.formTitle = "资源新增"; this.form.formTitle = "资源新增";
this.form.formShow = true; this.form.formShow = true;
this.form.id = ""; this.form.id = "";
this.form.resCode = ""; this.form.resCode = "";
this.form.resName = ""; this.form.resName = "";
this.form.resType = ""; this.form.resType = "";
this.form.resValue = ""; this.form.resValue = "";
@ -394,15 +398,16 @@
this.form.valid = pItem.valid; this.form.valid = pItem.valid;
this.form.rowVersion = pItem.rowVersion; this.form.rowVersion = pItem.rowVersion;
}, },
onChange: function (value) { onTreeFilter: function (value, data) {
this.$refs.tree.filter(value);
},
filterTree: function (value, data) {
if (!value) return true; if (!value) return true;
return data.comment.indexOf(value) !== -1; return data.resName.indexOf(value) !== -1
|| data.resCode.indexOf(value) !== -1
|| data.resValue.indexOf(value) !== -1;
}, },
onLoadTree: function () { onTreeLoad: function () {
new Ajax("wsys", "res").method("tree").post({}, function (response) { var vm_ = utils.copy(this.vm);
vm_.pageSize = 0;
new Ajax("wsys", "res", "tree").post(vm_, function (response) {
if (response.errors.length > 0) { if (response.errors.length > 0) {
nav.e(response.errors[0].message); nav.e(response.errors[0].message);
} else { } else {
@ -410,90 +415,17 @@
} }
}.bind(this)) }.bind(this))
}, },
onSave: function () { onTreeOpened: function () {
this.$refs['form'].validate(function (valid) { this.onTreeLoad();
if (valid) { }
if (this.form.id) { },
new Ajax("wsys", "res").update(this.form, function (response) { watch: {
if (response.errors.length > 0) { treeFilter: function (val) {
nav.e(response.errors[0].message); this.$refs.tree.filter(val);
} else {
this.onFind();
this.onLoadTree();
this.$refs['form'].resetFields();
this.form.formShow = false;
}
}.bind(this))
} else {
new Ajax("wsys", "res").create(this.form, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {
this.onFind();
this.onLoadTree();
this.$refs['form'].resetFields();
this.form.formShow = false;
}
}.bind(this))
}
} else {
return false;
}
}.bind(this));
},
onDelete: function (item) {
this.$confirm('将删除该项, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {
nav.s("删除成功");
this.onFind();
this.onLoadTree();
}
}.bind(this))
}.bind(this)).catch(function (action) {
});
},
onBitchDelete: function () {
if (this.select.length == 0) {
nav.w("至少选中一项");
} else {
this.$confirm('将删除已选择的项, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
nav.tipShow("删除中...");
this.select.forAsync(function (item, next) {
new Ajax(this.module, this.target).delete({id: item.id}, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {
this.result.remove(item)
}
next();
}.bind(this))
}.bind(this), function () {
nav.tipClose();
nav.s("批量删除成功.")
this.onFind();
this.onLoadTree();
}.bind(this))
}.bind(this)).catch(function (action) {
});
}
} }
}, },
mounted: function () { mounted: function () {
this.onFind(); this.onFind();
this.onLoadTree();
} }
}) })
</script> </script>

12
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
Unescape View File

@ -23,7 +23,7 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="box-card data"> <el-card class="box-card">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button> <el-button type="success" size="mini" icon="el-icon-plus" @click="onCreate">新增</el-button>
@ -294,7 +294,7 @@
}, },
doCheck: function (roleId, roleCode, resId, resCode, checked) { doCheck: function (roleId, roleCode, resId, resCode, checked) {
// 优先处理当前节点 // 优先处理当前节点
new Ajax("wsys", "roleRes").method("check").post({ new Ajax("wsys", "roleRes", "check").post({
roleId: roleId, roleId: roleId,
roleCode: roleCode, roleCode: roleCode,
resId: resId, resId: resId,
@ -309,14 +309,14 @@
}.bind(this)); }.bind(this));
}, },
onLoadTree: function () { onLoadTree: function () {
new Ajax("wsys", "res").method("tree").post({}, function (response) { new Ajax("wsys", "res", "tree").post({}, function (response) {
if (response.errors.length > 0) { if (response.errors.length > 0) {
nav.e(response.errors[0].message); nav.e(response.errors[0].message);
} else { } else {
this.treeData = response.result; this.treeData = response.result;
for (var i = 0; i < response.result.length; i++) { this.treeData.forTree(function (item) {
this.treeData[i].disabled = this.treeData[i].free; item.disabled = item.free;
} });
} }
}.bind(this)) }.bind(this))
}, },

27
src/main/resources/static/js/base.js
Unescape View File

@ -87,6 +87,33 @@ Array.prototype.forAsync = function (callBack, finish) {
} }
})(0) })(0)
}; };
/**
* 数组递归循环
* callBack(item,depth) 处理函数接受两个参数
* item 循环对象
* depth 循环深度数组[0,0,0]长度即为深度
*/
Array.prototype.forTreeDepth = function (callBack) {
(function loop(data, depth) {
if (Array.isArray(data) && data.length > 0) {
data.forEach(function (item, i) {
var depth_ = depth.slice(0);
depth_.push(i);
callBack(item, depth_);
loop(item.children, depth_);
});
}
})(this, []);
};
/**
* 数组递归循环
* callBack(item) 处理函数
*/
Array.prototype.forTree = function (callBack) {
this.forTreeDepth(function (item, depth) {
callBack(item);
})
};
/** /**
* 自定义Map对象 * 自定义Map对象
*/ */

BIN
src/main/resources/static/lib/element-ui/fonts/element-icons.ttf
View File

Binary file not shown.

BIN
src/main/resources/static/lib/element-ui/fonts/element-icons.woff
View File

Binary file not shown.

2
src/main/resources/static/lib/element-ui/index.css
View File

File diff suppressed because one or more lines are too long

2
src/main/resources/static/lib/element-ui/index.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.