From b1da105f86dfcd72e1f2fe94a694dcbeb6b972c8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Mar 2022 18:15:16 +0800
Subject: [PATCH] add admin-user modules
---
src/main/resources/templates/febs/views/dapp/member.html | 4
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java | 18 +
src/main/resources/mapper/dapp/DappFundFlowDao.xml | 1
src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java | 61 ++++
src/main/resources/mapper/dapp/DappUserMemberRelateDao.xml | 5
src/main/java/cc/mrbird/febs/dapp/service/DappUserService.java | 8
src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml | 1
src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java | 56 ++++
src/main/resources/templates/febs/views/dapp/userAdd.html | 84 ++++++
src/main/resources/templates/febs/views/dapp/userUpdate.html | 216 ++++++++++++++++
src/main/resources/mapper/dapp/DappMemberDao.xml | 1
src/main/java/cc/mrbird/febs/system/entity/User.java | 3
src/main/resources/templates/febs/views/dapp/user.html | 266 ++++++++++++++++++++
src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java | 26 ++
src/main/java/cc/mrbird/febs/dapp/mapper/DappUserMemberRelateDao.java | 7
15 files changed, 755 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
new file mode 100644
index 0000000..2e8600d
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
@@ -0,0 +1,56 @@
+package cc.mrbird.febs.dapp.controller;
+
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
+import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.dapp.service.DappUserService;
+import cc.mrbird.febs.system.entity.User;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wzy
+ * @date 2022-03-24
+ **/
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "dappUser")
+public class DappUserController {
+
+ private final DappUserService dappUserService;
+
+ @RequiresPermissions("admin:add")
+ @PostMapping(value = "/add")
+ @ControllerEndpoint(operation = "新增用户", exceptionMessage = "新增用户失败")
+ public FebsResponse add(User user) {
+ dappUserService.add(user);
+ return new FebsResponse().success();
+ }
+
+ @RequiresPermissions("admin:update")
+ @PostMapping(value = "/update")
+ @ControllerEndpoint(operation = "编辑用户", exceptionMessage = "编辑用户失败")
+ public FebsResponse update(User user) {
+ return null;
+ }
+
+ @RequiresPermissions("admin:delete")
+ @PostMapping(value = "/delete")
+ @ControllerEndpoint(operation = "删除用户", exceptionMessage = "删除用户失败")
+ public FebsResponse delete(User user) {
+ return null;
+ }
+
+ @PostMapping(value = "/resetPwd/{id}")
+ @ControllerEndpoint(operation = "重置密码", exceptionMessage = "重置密码失败")
+ public FebsResponse resetPwd(@PathVariable("id") Long id) {
+ return null;
+ }
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index 96c494b..613802f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -17,6 +17,24 @@
@RequiredArgsConstructor
public class ViewController {
+ @GetMapping(value = "admin")
+ @RequiresPermissions("admin:view")
+ public String user() {
+ return FebsUtil.view("dapp/user");
+ }
+
+ @GetMapping(value = "admin/add")
+ @RequiresPermissions("admin:add")
+ public String addUser() {
+ return FebsUtil.view("dapp/userAdd");
+ }
+
+ @GetMapping(value = "admin/update")
+ @RequiresPermissions("admin:update")
+ public String updateUser() {
+ return FebsUtil.view("dapp/userUpdate");
+ }
+
@GetMapping("member")
@RequiresPermissions("member:view")
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java
new file mode 100644
index 0000000..2635b0b
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java
@@ -0,0 +1,26 @@
+package cc.mrbird.febs.dapp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-03-24
+ **/
+@Data
+@TableName("dapp_user_member_relate")
+public class DappUserMemberRelateEntity {
+
+ @TableId(value = "id",type = IdType.AUTO)
+ private Long id;
+
+ private Long userId;
+
+ private Long memberId;
+
+ private Long createUser;
+
+ private String inviteId;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappUserMemberRelateDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappUserMemberRelateDao.java
new file mode 100644
index 0000000..23a82a7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappUserMemberRelateDao.java
@@ -0,0 +1,7 @@
+package cc.mrbird.febs.dapp.mapper;
+
+import cc.mrbird.febs.dapp.entity.DappUserMemberRelateEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface DappUserMemberRelateDao extends BaseMapper<DappUserMemberRelateEntity> {
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappUserService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappUserService.java
new file mode 100644
index 0000000..5abf472
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappUserService.java
@@ -0,0 +1,8 @@
+package cc.mrbird.febs.dapp.service;
+
+import cc.mrbird.febs.system.entity.User;
+
+public interface DappUserService {
+
+ void add(User user);
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java
new file mode 100644
index 0000000..0717ace
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java
@@ -0,0 +1,61 @@
+package cc.mrbird.febs.dapp.service.impl;
+
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.Md5Util;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.DappUserMemberRelateEntity;
+import cc.mrbird.febs.dapp.mapper.DappMemberDao;
+import cc.mrbird.febs.dapp.mapper.DappUserMemberRelateDao;
+import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.service.DappUserService;
+import cc.mrbird.febs.system.entity.User;
+import cc.mrbird.febs.system.entity.UserRole;
+import cc.mrbird.febs.system.mapper.UserMapper;
+import cc.mrbird.febs.system.mapper.UserRoleMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author wzy
+ * @date 2022-03-24
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DappUserServiceImpl implements DappUserService {
+
+ private final DappMemberDao dappMemberDao;
+ private final DappUserMemberRelateDao dappUserMemberRelateDao;
+ private final UserMapper userMapper;
+ private final UserRoleMapper userRoleMapper;
+
+ @Override
+ public void add(User user) {
+ DappMemberEntity member = dappMemberDao.selectMemberInfoByInviteId(user.getInviteId());
+ if(member == null) {
+ throw new FebsException("邀请码错误");
+ }
+
+ user.setCreateTime(new Date());
+ user.setStatus(User.STATUS_VALID);
+ user.setAvatar(User.DEFAULT_AVATAR);
+ user.setTheme(User.THEME_BLACK);
+ user.setIsTab(User.TAB_OPEN);
+ user.setPassword(Md5Util.encrypt(user.getUsername(), User.DEFAULT_PASSWORD));
+ userMapper.insert(user);
+
+ UserRole userRole = new UserRole();
+ userRole.setRoleId(Long.parseLong(user.getRoleId()));
+ userRole.setUserId(user.getUserId());
+ userRoleMapper.insert(userRole);
+
+ DappUserMemberRelateEntity relate = new DappUserMemberRelateEntity();
+ relate.setMemberId(member.getId());
+ relate.setUserId(user.getUserId());
+ relate.setInviteId(user.getInviteId());
+ dappUserMemberRelateDao.insert(relate);
+ }
+}
diff --git a/src/main/java/cc/mrbird/febs/system/entity/User.java b/src/main/java/cc/mrbird/febs/system/entity/User.java
index 81e0987..3117e6a 100644
--- a/src/main/java/cc/mrbird/febs/system/entity/User.java
+++ b/src/main/java/cc/mrbird/febs/system/entity/User.java
@@ -211,4 +211,7 @@
public Long getId() {
return userId;
}
+
+ @TableField(exist = false)
+ private String inviteId;
}
diff --git a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
index 1363894..f474aba 100644
--- a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
@@ -13,6 +13,7 @@
and a.type=#{record.type}
</if>
</where>
+ order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 8306464..3b25b34 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -16,5 +16,6 @@
and b.address = #{record.address}
</if>
</where>
+ order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 18c7eb4..95db780 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -26,5 +26,6 @@
and invite_id = #{record.inviteId}
</if>
</where>
+ order by create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/DappUserMemberRelateDao.xml b/src/main/resources/mapper/dapp/DappUserMemberRelateDao.xml
new file mode 100644
index 0000000..3b93211
--- /dev/null
+++ b/src/main/resources/mapper/dapp/DappUserMemberRelateDao.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.dapp.mapper.DappUserMemberRelateDao">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 6f16640..fd067a2 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -240,11 +240,11 @@
{type: 'checkbox'},
{type: 'numbers'},
{field: 'address', title: '地址', minWidth: 130},
- {title: '余额', templet: '#balance', minWidth: 150},
+ {title: '余额', templet: '#balance', minWidth: 120},
{title: '授权列表', templet: '#approve-list', minWidth: 110},
{field: 'inviteId', title: '邀请码', minWidth: 130},
{field: 'refererId', title: '上级邀请码', minWidth: 130},
- {title: '账户状态', templet: '#user-status'},
+ {title: '账户状态', templet: '#user-status', minWidth: 120},
{title: '是否可兑换', templet: '#change-able', minWidth: 130},
{title: '是否可提现', templet: '#withdraw-able', minWidth: 130},
{field: 'createTime', title: '创建时间', minWidth: 180},
diff --git a/src/main/resources/templates/febs/views/dapp/user.html b/src/main/resources/templates/febs/views/dapp/user.html
new file mode 100644
index 0000000..7ae8f5a
--- /dev/null
+++ b/src/main/resources/templates/febs/views/dapp/user.html
@@ -0,0 +1,266 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-admin" lay-title="管理员列表">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md10">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">用户名</label>
+ <div class="layui-input-inline">
+ <input type="text" name="username" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">创建时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="createTime" id="user-createTime" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">状态</label>
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value=""></option>
+ <option value="0">禁用</option>
+ <option value="1">有效</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
+ shiro:hasAnyPermissions="admin:add,admin:update,admin:reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script type="text/html" id="user-status">
+ {{#
+ var status = {
+ 1: {title: '有效', color: 'green'},
+ 0: {title: '禁用', color: 'volcano'}
+ }[d.status];
+ }}
+ <span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span>
+</script>
+<script type="text/html" id="user-sex">
+ {{#
+ var sex = {
+ 2: {title: '保密'},
+ 1: {title: '女'},
+ 0: {title: '男'}
+ }[d.sex];
+ }}
+ <span>{{ sex.title }}</span>
+</script>
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="admin:view,admin:update,admin:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="edit" shiro:hasPermission="admin:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+ <a lay-event="del" shiro:hasPermission="admin:delete"><i class="layui-icon febs-edit-area febs-red"></i></a>
+</script>
+<script data-th-inline="none" type="text/javascript">
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-admin'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ initTable();
+
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+ dropdown.render({
+ elem: $view.find('.action-more'),
+ click: function (name, elem, event) {
+ var checkStatus = table.checkStatus('userTable');
+ if (name === 'add') {
+ febs.modal.open('新增用户', 'dappView/admin/add', {
+ btn: ['提交', '重置'],
+ area: $(window).width() <= 750 ? '95%' : '50%',
+ offset: '30px',
+ yes: function (index, layero) {
+ $('#dapp-user-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ $('#dapp-user-add').find('#reset').trigger('click');
+ return false;
+ }
+ });
+ }
+ if (name === 'delete') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要删除的用户');
+ } else {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ var userIds = [];
+ layui.each(checkStatus.data, function (key, item) {
+ userIds.push(item.userId)
+ });
+ deleteUsers(userIds.join(','));
+ });
+ }
+ }
+ if (name === 'reset') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要重置密码的用户');
+ } else {
+ var usernames = [];
+ layui.each(checkStatus.data, function (key, item) {
+ usernames.push(item.username)
+ });
+ febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
+ febs.alert.success('所选用户密码已重置为1234qwer');
+ });
+ }
+ }
+ },
+ options: [{
+ name: 'add',
+ title: '新增用户',
+ perms: 'admin:add'
+ }, {
+ name: 'delete',
+ title: '删除用户',
+ perms: 'admin:delete'
+ }, {
+ name: 'reset',
+ title: '密码重置',
+ perms: 'admin:reset'
+ }]
+ });
+
+ table.on('tool(userTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ if (layEvent === 'del') {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ deleteUsers(data.userId);
+ });
+ }
+ if (layEvent === 'edit') {
+ febs.modal.open('修改用户', 'dappView/admin/update/' + data.username, {
+ area: $(window).width() <= 750 ? '90%' : '50%',
+ offset: '30px',
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#user-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ });
+
+ table.on('sort(userTable)', function (obj) {
+ sortObject = obj;
+ tableIns.reload({
+ initSort: obj,
+ where: $.extend(getQueryParams(), {
+ field: obj.field,
+ order: obj.type
+ })
+ });
+ });
+
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ treeSelect.revokeNode('dept');
+ sortObject.type = 'null';
+ createTimeTo = null;
+ createTimeFrom = null;
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'user/list',
+ cols: [[
+ {type: 'checkbox'},
+ {field: 'username', title: '用户名', minWidth: 100},
+ {title: '性别', templet: '#user-sex'},
+ {field: 'deptName', title: '部门'},
+ {field: 'mobile', title: '手机', minWidth: 165},
+ {field: 'email', title: '邮箱', minWidth: 180},
+ {title: '状态', templet: '#user-status'},
+ {field: 'createTime', title: '创建时间', minWidth: 180, sort: true},
+ {title: '操作', toolbar: '#user-option', minWidth: 140}
+ ]]
+ });
+ }
+
+ function getQueryParams() {
+ var createTime = $searchForm.find('input[name="createTime"]').val();
+ if (createTime) {
+ createTimeFrom = createTime.split(' - ')[0];
+ createTimeTo = createTime.split(' - ')[1];
+ }
+ return {
+ createTimeFrom: createTimeFrom,
+ createTimeTo: createTimeTo,
+ username: $searchForm.find('input[name="username"]').val().trim(),
+ status: $searchForm.find("select[name='status']").val(),
+ sex: $searchForm.find("select[name='sex']").val(),
+ mobile: $searchForm.find("input[name='mobile']").val().trim(),
+ deptId: $searchForm.find("input[name='dept']").val().trim(),
+ invalidate_ie_cache: new Date()
+ };
+ }
+
+ function deleteUsers(userIds) {
+ var currentUserId = currentUser.userId + '';
+ if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
+ febs.alert.warn('所选用户包含当前登录用户，无法删除');
+ return;
+ }
+ febs.get(ctx + 'user/delete/' + userIds, null, function () {
+ febs.alert.success('删除用户成功');
+ $query.click();
+ });
+ }
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/userAdd.html b/src/main/resources/templates/febs/views/dapp/userAdd.html
new file mode 100644
index 0000000..3e7321d
--- /dev/null
+++ b/src/main/resources/templates/febs/views/dapp/userAdd.html
@@ -0,0 +1,84 @@
+<style>
+ #dapp-user-add {
+ padding: 20px 25px 25px 0;
+ }
+ #dapp-user-add .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #dapp-user-add #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #dapp-user-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+</style>
+<div class="layui-fluid" id="dapp-user-add">
+ <form class="layui-form" action="" lay-filter="dapp-user-add-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">用户名：</label>
+ <div class="layui-input-block">
+ <input type="text" name="username" minlength="2" maxlength="10" lay-verify="range|username"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">邀请码：</label>
+ <div class="layui-input-block">
+ <input type="text" name="inviteId" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">状态：</label>
+ <div class="layui-input-block">
+ <input type="radio" name="status" value="1" title="有效" checked="">
+ <input type="radio" name="status" value="0" title="禁用">
+ </div>
+ </div>
+ <div class="layui-form-item layui-form-text">
+ <label class="layui-form-label">备注：</label>
+ <div class="layui-input-block">
+ <textarea name="description" maxlength="100" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="dapp-user-add-form-submit" id="submit"></button>
+ <button type="reset" class="layui-btn" id="reset"></button>
+ </div>
+ </form>
+</div>
+
+<script>
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ formSelects = layui.formSelects,
+ treeSelect = layui.treeSelect,
+ form = layui.form,
+ eleTree = layui.eleTree,
+ $view = $('#dapp-user-add'),
+ validate = layui.validate,
+ _deptTree;
+
+ form.verify(validate);
+ form.render();
+
+ form.on('submit(dapp-user-add-form-submit)', function (data) {
+ var checked = _deptTree.getChecked(false, true);
+ var deptIds = [];
+ layui.each(checked, function (key, item) {
+ deptIds.push(item.id)
+ });
+ data.deptIds = deptIds.join(",");
+ febs.post(ctx + 'user', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('新增用户成功，初始密码为 1234qwer');
+ $('#febs-user').find('#query').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/userUpdate.html b/src/main/resources/templates/febs/views/dapp/userUpdate.html
new file mode 100644
index 0000000..a0a5d3e
--- /dev/null
+++ b/src/main/resources/templates/febs/views/dapp/userUpdate.html
@@ -0,0 +1,216 @@
+<style>
+ #user-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #user-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #user-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #user-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+
+</style>
+<div class="layui-fluid" id="user-update">
+ <form class="layui-form" action="" lay-filter="user-update-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label febs-form-item-require">用户id：</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" data-th-value="${user.userId}">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">用户名：</label>
+ <div class="layui-input-block">
+ <input type="text" name="username" minlength="4" maxlength="10" data-th-id="${user.userId}"
+ lay-verify="range|username" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">手机：</label>
+ <div class="layui-input-block">
+ <input type="tel" name="mobile" lay-verify="phone" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">邮箱：</label>
+ <div class="layui-input-block">
+ <input type="text" name="email" lay-verify="email" maxlength="50" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">角色：</label>
+ <div class="layui-input-block">
+ <select name="roleId"
+ lay-verify="required"
+ xm-select-direction="down"
+ xm-select="user-update-role"
+ xm-select-skin="default">
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">部门：</label>
+ <div class="layui-input-block">
+ <input type="text" name="deptId" id="user-update-dept" lay-filter="user-update-dept"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">状态：</label>
+ <div class="layui-input-block">
+ <input type="radio" name="status" value="1" title="有效">
+ <input type="radio" name="status" value="0" title="禁用">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">性别：</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sex" value="0" title="男性">
+ <input type="radio" name="sex" value="1" title="女性">
+ <input type="radio" name="sex" value="2" title="保密">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">数据权限：</label>
+ <div class="layui-input-block" id="data-permission-tree-block">
+ <div class="data-permission-tree" lay-filter="dataPermissionTree" style="margin-left: 1rem"></div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-form-text">
+ <label class="layui-form-label">备注：</label>
+ <div class="layui-input-block">
+ <textarea name="description" maxlength="100" class="layui-textarea">
+ </textarea>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="user-update-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ formSelects = layui.formSelects,
+ treeSelect = layui.treeSelect,
+ form = layui.form,
+ eleTree = layui.eleTree,
+ user = [[${user}]],
+ $view = $('#user-update'),
+ validate = layui.validate,
+ _deptTree;
+
+ form.verify(validate);
+ form.render();
+
+ initUserValue();
+ renderDeptTree();
+
+ formSelects.render();
+
+ function renderDeptTree() {
+ _deptTree = eleTree.render({
+ elem: $view.find('.data-permission-tree'),
+ url: ctx + 'dept/tree',
+ accordion: true,
+ highlightCurrent: true,
+ showCheckbox: true,
+ checkStrictly: true,
+ renderAfterExpand: false,
+ request: {
+ name: 'name',
+ key: "id",
+ checked: "checked",
+ data: 'data'
+ },
+ response: {
+ statusName: "code",
+ statusCode: 200,
+ dataName: "data"
+ },
+ done: function (r) {
+ _deptTree.setChecked(user.deptIds.split(","), true);
+ }
+ });
+ return _deptTree;
+ }
+
+ treeSelect.render({
+ elem: $view.find('#user-update-dept'),
+ type: 'get',
+ data: ctx + 'dept/select/tree',
+ placeholder: '请选择',
+ search: false,
+ success: function () {
+ treeSelect.checkNode('user-update-dept', user.deptId);
+ }
+ });
+
+ formSelects.config('user-update-role', {
+ searchUrl: ctx + 'role',
+ response: {
+ statusCode: 200
+ },
+ beforeSuccess: function (id, url, searchVal, result) {
+ var data = result.data;
+ var tranData = [];
+ for (var i = 0; i < data.length; i++) {
+ tranData.push({
+ name: data[i].roleName,
+ value: data[i].roleId
+ })
+ }
+ result.data = tranData;
+ return result;
+ },
+ success: function () {
+ formSelects.value('user-update-role', user.roleId.split(','));
+ },
+ error: function (id, url, searchVal, err) {
+ console.error(err);
+ febs.alert.error('获取角色列表失败');
+ }
+ });
+
+ function initUserValue() {
+ form.val("user-update-form", {
+ "username": user.username,
+ "mobile": user.mobile,
+ "email": user.email,
+ "status": user.status,
+ "sex": user.sex,
+ "description": user.description
+ });
+ }
+
+ form.on('submit(user-update-form-submit)', function (data) {
+ var checked = _deptTree.getChecked(false, true);
+ var deptIds = [];
+ layui.each(checked, function (key, item) {
+ deptIds.push(item.id)
+ });
+ data.field.deptIds = deptIds.join(",");
+ if (febs.nativeEqual(data.field, user)) {
+ febs.alert.warn('数据未作任何修改！');
+ return false;
+ }
+ febs.post(ctx + 'user/update', data.field, function () {
+ layer.closeAll();
+ febs.alert.success(user.username + ' 用户数据修改成功');
+ $('#febs-user').find('#query').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1