yshop意向点餐系统v1.2.2
This commit is contained in:
hupeng committed
1 parent
d03982bf66
commit
fc575265c3
4685 files changed
+518479
-182017
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 233 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 213 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 124 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
@@ -1,20 +1,21 @@
|
|||||||
The MIT License (MIT)
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2018 RuoYi
|
Copyright (c) 2023 yshop
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
the Software without restriction, including without limitation the rights to
|
in the Software without restriction, including without limitation the rights
|
||||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
@@ -1,133 +1,138 @@
|
|||||||
|
|
||||||
|
|
||||||
|
## 平台简介
|
||||||
|
|
||||||
|
意向点餐(扫码点餐)系统，在线点餐(外卖与自取)小程序模式，支持多门店模式，基础技术Java，uniapp(vue3)（支持H5、微信小程序）
|
||||||
|
采用当前流行技术组合的前后端分离点餐系统： SpringBoot、Spring Security OAuth2、MybatisPlus、SpringSecurity、jwt、redis、Vue3的前后端分离的系统，
|
||||||
|
包含外卖与自取、商品管理(多规格sku)、店铺管理、云小票打印、图片素材库、订单管理、积分兑换、充值、优惠券、充值、多门店、微信公众号、门店移动端、分销商、桌面扫码点餐、拼团、邀请有礼、会员等级等功能，更适合企业或个人二次开发.
|
||||||
|
|
||||||
|
官网地址：[https://www.yixiang.co/](https://www.yixiang.co/)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### supplier2.0已经发布:
|
## 演示地址
|
||||||
1、移除Light Security jwt 验证更改为shaun pac4j-jwt
|
|
||||||
|
|
||||||
2、mapstruct更新1.3.1 同时修复不能编译成对象的问题
|
| 后台登陆： | https://dc.yixiang.co 账号/密码：yshop002/123456789 |
|
||||||
|
|---|---|
|
||||||
|
| 门店登陆： | https://dc.yixiang.co 账号/密码：yixiang001/123456789 |
|
||||||
|
| 移动端演示：关注右边公众号点击菜单其他系统体验点餐小程序与点餐H5，其中如果演示使用验证码登陆的点击下验证码默认验证码是9999 |  |
|
||||||
|
|
||||||
3、新的目录结构
|
## 视频资料
|
||||||
|
如果对您有帮助，您可以点右上角 "Star" 支持一下，这样我们才有继续免费下去的动力，谢谢！ QQ交流群 (入群前，请在网页右上角点 "Star" )，群里有视频教程哦！！
|
||||||
|
|
||||||
4、同步ruoyi最新版本V4.6.1
|
交流QQ群：544263002
|
||||||
|
|
||||||
5、喜欢的小伙伴记得star下
|
## 项目说明
|
||||||
|
|
||||||
6、本项目全开源 请自行下载的哦
|
|
||||||
|
|
||||||
### supplier2.1即将发布:
|
|
||||||
- 新的重构版本正在开发中，喜欢的小伙伴记得star下
|
|
||||||
- 新版本移动端将使用uniapp
|
|
||||||
|
|
||||||
|
|
||||||
### **商城概况：**
|
```
|
||||||
|
yshop-drink. Java工程
|
||||||
|
yshop-drink-vue 后台前端vue3工程
|
||||||
|
yshop-drink-uniapp-vue3 移动端uniapp(vue3版本)工程，支持微信小程序、h5
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
本商城系统是一套完整的商城系统，包括小程序+小程序API+后台商城管理！！
|
## 本地快速启动
|
||||||
|
##### 1、环境要求
|
||||||
|
|
||||||
**系统基础组合来源：**
|
```
|
||||||
|
jdk8
|
||||||
|
mysql8
|
||||||
|
redis6+
|
||||||
|
node14+
|
||||||
|
|
||||||
程序员就要坚持着不要重复造轮子想法，所有就在gitee里找自己合适的轮子：：
|
```
|
||||||
|
##### 2、开发工具
|
||||||
|
|
||||||
1、若依管理后台:用它做后台管理
|
```
|
||||||
|
idea
|
||||||
|
vscode
|
||||||
|
hbuilder
|
||||||
|
|
||||||
2、shaun pac4j-jwt：强大jwt权限框架
|
```
|
||||||
|
##### 3、后端启动
|
||||||
|
|
||||||
当然他们本身已经完成了很多功能，这里不多说，大家可以直接去码云搜索即可，后面会放上他们连接。
|
|
||||||
|
|
||||||
本系统主要包括三部分：
|
- 3.1 请使用idea打开Java工程，自动会安装依赖
|
||||||
|
- 3.2 创建数据库且导入工程目录下sql/yixiang-drink.sql 文件
|
||||||
|
- 3.3 找到项目下的yshop-server 的yml,如图：
|
||||||
|
|
||||||
|
- 3.4 工程下输入
|
||||||
|
|
||||||
第一：商城后台，完成完整的商城管理系统，目前已经完成，至于有bug大家可以直接issue或者进群交流（后面会打出来的(⊙o⊙)？！！），
|
` mvn clean install package '-Dmaven.test.skip=true`
|
||||||
功能大概包括：商品管理，商品多规格属性管理，商品分类，商品品牌，商品订单，会员信息等等。
|
- 3.5 启动项目，如图
|
||||||
涉及到技术： **springboot+Thymeleaf+mybatis**
|
|
||||||
|
|
||||||
大致效果如下：
|
##### 4、后台vue启动
|
||||||
<table>
|
|
||||||
<tr>
|
- 4.1 vscode 打开vue工程，在目录下输入命令，npm install
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180715_7394c4c4_477893.png"/></td>
|
- 4.2 配置api如图
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180732_b2055281_477893.png"/></td>
|
|
||||||
</tr>
|
- 4.3 本地启动 npm run front
|
||||||
<tr>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180740_8cc475d4_477893.png"/></td>
|
##### 5 移动端uniapp启动
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180752_45e9b4ce_477893.png"/></td>
|
|
||||||
</tr>
|
- 5.1 hbuilder导入uniapp项目，
|
||||||
<tr>
|
- 5.2 配置api
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180800_31df8e35_477893.png"/></td>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/180809_4147d2e2_477893.png"/></td>
|
- 5.3 配置小程序
|
||||||
</tr>
|
|
||||||
</table>
|
- 5.4 运行小程序
|
||||||
|
|
||||||
|
- 5.5 运行h5
|
||||||
|
|
||||||
|
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 小程序截图
|
||||||
|
|
||||||
第二：小程序API，目前API模块已经基本完成,
|
|  |  |
|
||||||
涉及到技术： **springboot+mybatis-plus+jwt+mapstruct+lombok+redis+swagger**
|
|---|---|
|
||||||
|
|  |  |
|
||||||
|
|  |  |
|
||||||
|
|
||||||
大致如下效果：
|
## 后台截图
|
||||||
|
|
||||||
<table>
|
|  | |
|
||||||
<tr>
|
|---|---|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0914/145813_85d0bdc7_477893.png"/></td>
|
|  |  |
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0916/164354_34a2cf90_477893.png"/></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0928/174546_7531f0ca_477893.png"/></td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
|
|
||||||
|
## 技术栈
|
||||||
|
Spring Boot，
|
||||||
|
|
||||||
第三：mpvue小程序，小程序主要是用 **mpvue** 框架开发，这里就不说它的好处。
|
Spring Security oauth2，
|
||||||
|
|
||||||
|
MyBatis，
|
||||||
|
|
||||||
|
MyBatisPlus，
|
||||||
|
|
||||||
|
Redis，
|
||||||
|
|
||||||
|
lombok，
|
||||||
|
|
||||||
|
hutool
|
||||||
|
|
||||||
|
Vue3，
|
||||||
|
|
||||||
|
Element UI，
|
||||||
|
|
||||||
|
uniapp(vue3)
|
||||||
|
|
||||||
|
## 特别鸣谢
|
||||||
|
|
||||||
|
|
||||||
|
- ruoyi-vue-pro:https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
||||||
mpvue 小程序运行步骤：
|
- element-plus:https://element-plus.gitee.io/zh-CN/
|
||||||
|
- vue:https://cn.vuejs.org/
|
||||||
1、安装node环境
|
- pay-java-parent:https://gitee.com/egzosn/pay-java-parent
|
||||||
node 是8版本，这边开发版本是8.12.0，由于mpvue属于老牌小程序框架了，目前这边验证的只是这个node版本，
|
- uvui：https://www.uvui.cn/
|
||||||
当然新的小程序UNIAPP发布之后没用此限制拉
|
- uniapp:https://uniapp.dcloud.net.cn/
|
||||||
|
|
||||||
2、设置npm淘宝镜像
|
|
||||||
|
|
||||||
npm set registry https://registry.npm.taobao.org/
|
|
||||||
|
|
||||||
3、npm install
|
|
||||||
|
|
||||||
4、npm run dev
|
|
||||||
|
|
||||||
|
|
||||||
大致效果如下：
|
## 开源协议
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/181113_1b7f255a_477893.jpeg"/></td>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/181123_0c86c94c_477893.jpeg"/></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/181132_b729a89b_477893.jpeg"/></td>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/181140_08e362ad_477893.jpeg"/></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><img src="https://images.gitee.com/uploads/images/2019/0830/181150_b5e0cd3e_477893.jpeg"/></td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
**学习交流**
|
|
||||||
|
|
||||||
|
|
||||||
其他：欢迎star或者提出你们宝贵的建议哦！！！
|
|
||||||
|
|
||||||
****Requirement:****
|
|
||||||
- JDK1.8+,
|
|
||||||
- mysql5.7+
|
|
||||||
|
|
||||||
**特别鸣谢**
|
|
||||||
|
|
||||||
若依系统：[ruoyi](https://gitee.com/y_project/RuoYi)
|
|
||||||
|
|
||||||
强大jwt权限框架：[shaun](https://gitee.com/baomidou/shaun)
|
|
||||||
|
|
||||||
|
本项目采用比 Apache 2.0 更宽松的 [MIT License](https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE) 开源协议，个人与企业可 100% 免费使用，不用保留类作者、Copyright 信息。
|
||||||
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 266 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 595 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 322 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 542 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 311 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 386 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 544 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 255 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 198 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 170 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 198 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 167 KiB |
@@ -1,12 +0,0 @@
|
|||||||
@echo off
|
|
||||||
echo.
|
|
||||||
echo [信息] 清理生成路径。
|
|
||||||
echo.
|
|
||||||
|
|
||||||
%~d0
|
|
||||||
cd %~dp0
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
call mvn clean
|
|
||||||
|
|
||||||
pause
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
@echo off
|
|
||||||
echo.
|
|
||||||
echo [信息] 打包Web工程，生成war/jar包文件。
|
|
||||||
echo.
|
|
||||||
|
|
||||||
%~d0
|
|
||||||
cd %~dp0
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
call mvn clean package -Dmaven.test.skip=true
|
|
||||||
|
|
||||||
pause
|
|
||||||
-14
@@ -1,14 +0,0 @@
|
|||||||
@echo off
|
|
||||||
echo.
|
|
||||||
echo [信息] 运行Web工程。
|
|
||||||
echo.
|
|
||||||
|
|
||||||
cd %~dp0
|
|
||||||
cd ../ruoyi-admin/target
|
|
||||||
|
|
||||||
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
|
|
||||||
|
|
||||||
java -jar %JAVA_OPTS% ruoyi-admin.jar
|
|
||||||
|
|
||||||
cd bin
|
|
||||||
pause
|
|
||||||
Binary file not shown.
@@ -1,291 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
|
|
||||||
<name>supplier</name>
|
|
||||||
<url>https://www.yixiang.co</url>
|
|
||||||
<description>供货管理系统</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<supplier.version>2.0.0</supplier.version>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
|
|
||||||
<shiro.version>1.7.1</shiro.version>
|
|
||||||
<thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
|
|
||||||
<druid.version>1.2.6</druid.version>
|
|
||||||
<bitwalker.version>1.21</bitwalker.version>
|
|
||||||
<kaptcha.version>2.3.2</kaptcha.version>
|
|
||||||
<swagger.version>2.9.2</swagger.version>
|
|
||||||
<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
|
|
||||||
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
|
|
||||||
<fastjson.version>1.2.83</fastjson.version>
|
|
||||||
<oshi.version>5.6.0</oshi.version>
|
|
||||||
<jna.version>5.7.0</jna.version>
|
|
||||||
<commons.io.version>2.5</commons.io.version>
|
|
||||||
<commons.fileupload.version>1.3.3</commons.fileupload.version>
|
|
||||||
<poi.version>4.1.2</poi.version>
|
|
||||||
<velocity.version>1.7</velocity.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<!-- 依赖声明 -->
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- SpringBoot的依赖配置-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-dependencies</artifactId>
|
|
||||||
<version>2.2.13.RELEASE</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--阿里数据库连接池 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
|
||||||
<version>${druid.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--验证码 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.penggle</groupId>
|
|
||||||
<artifactId>kaptcha</artifactId>
|
|
||||||
<version>${kaptcha.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--Shiro核心框架 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.shiro</groupId>
|
|
||||||
<artifactId>shiro-core</artifactId>
|
|
||||||
<version>${shiro.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Shiro使用Spring框架 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.shiro</groupId>
|
|
||||||
<artifactId>shiro-spring</artifactId>
|
|
||||||
<version>${shiro.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Shiro使用EhCache缓存框架 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.shiro</groupId>
|
|
||||||
<artifactId>shiro-ehcache</artifactId>
|
|
||||||
<version>${shiro.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- thymeleaf模板引擎和shiro框架的整合 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.theborakompanioni</groupId>
|
|
||||||
<artifactId>thymeleaf-extras-shiro</artifactId>
|
|
||||||
<version>${thymeleaf.extras.shiro.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 解析客户端操作系统、浏览器等 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>eu.bitwalker</groupId>
|
|
||||||
<artifactId>UserAgentUtils</artifactId>
|
|
||||||
<version>${bitwalker.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringBoot集成mybatis框架 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mybatis.spring.boot</groupId>
|
|
||||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
|
||||||
<version>${mybatis-spring-boot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- pagehelper 分页插件 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.pagehelper</groupId>
|
|
||||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
|
||||||
<version>${pagehelper.boot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 获取系统信息 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.oshi</groupId>
|
|
||||||
<artifactId>oshi-core</artifactId>
|
|
||||||
<version>${oshi.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.java.dev.jna</groupId>
|
|
||||||
<artifactId>jna</artifactId>
|
|
||||||
<version>${jna.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.java.dev.jna</groupId>
|
|
||||||
<artifactId>jna-platform</artifactId>
|
|
||||||
<version>${jna.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger2-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger2</artifactId>
|
|
||||||
<version>${swagger.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>io.swagger</groupId>
|
|
||||||
<artifactId>swagger-annotations</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>io.swagger</groupId>
|
|
||||||
<artifactId>swagger-models</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger2-UI-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
|
||||||
<version>${swagger.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--io常用工具类 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-io</groupId>
|
|
||||||
<artifactId>commons-io</artifactId>
|
|
||||||
<version>${commons.io.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--文件上传工具类 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-fileupload</groupId>
|
|
||||||
<artifactId>commons-fileupload</artifactId>
|
|
||||||
<version>${commons.fileupload.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- excel工具 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi-ooxml</artifactId>
|
|
||||||
<version>${poi.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--velocity代码生成使用模板 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
<artifactId>velocity</artifactId>
|
|
||||||
<version>${velocity.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-collections</groupId>
|
|
||||||
<artifactId>commons-collections</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 阿里JSON解析器 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>fastjson</artifactId>
|
|
||||||
<version>${fastjson.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 定时任务-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-quartz</artifactId>
|
|
||||||
<version>${supplier.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 代码生成-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-generator</artifactId>
|
|
||||||
<version>${supplier.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 核心模块-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-framework</artifactId>
|
|
||||||
<version>${supplier.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 系统模块-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-system</artifactId>
|
|
||||||
<version>${supplier.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 通用工具-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-common</artifactId>
|
|
||||||
<version>${supplier.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<modules>
|
|
||||||
<module>supplier-admin</module>
|
|
||||||
<module>supplier-framework</module>
|
|
||||||
<module>supplier-system</module>
|
|
||||||
<module>supplier-quartz</module>
|
|
||||||
<module>supplier-generator</module>
|
|
||||||
<module>supplier-common</module>
|
|
||||||
<module>supplier-api</module>
|
|
||||||
</modules>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.1</version>
|
|
||||||
<configuration>
|
|
||||||
<source>${java.version}</source>
|
|
||||||
<target>${java.version}</target>
|
|
||||||
<encoding>${project.build.sourceEncoding}</encoding>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>public</id>
|
|
||||||
<name>aliyun nexus</name>
|
|
||||||
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
|
|
||||||
<releases>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</releases>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>public</id>
|
|
||||||
<name>aliyun nexus</name>
|
|
||||||
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
|
|
||||||
<releases>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</pluginRepository>
|
|
||||||
</pluginRepositories>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
AppName=RuoYi.jar
|
|
||||||
|
|
||||||
#JVM参数
|
|
||||||
JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
|
|
||||||
APP_HOME=`pwd`
|
|
||||||
LOG_PATH=$APP_HOME/logs/$AppName.log
|
|
||||||
|
|
||||||
if [ "$1" = "" ];
|
|
||||||
then
|
|
||||||
echo -e "\033[0;31m 未输入操作名 \033[0m \033[0;34m {start|stop|restart|status} \033[0m"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$AppName" = "" ];
|
|
||||||
then
|
|
||||||
echo -e "\033[0;31m 未输入应用名 \033[0m"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
function start()
|
|
||||||
{
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
|
|
||||||
|
|
||||||
if [ x"$PID" != x"" ]; then
|
|
||||||
echo "$AppName is running..."
|
|
||||||
else
|
|
||||||
nohup java -jar $JVM_OPTS target/$AppName > /dev/null 2>&1 &
|
|
||||||
echo "Start $AppName success..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop()
|
|
||||||
{
|
|
||||||
echo "Stop $AppName"
|
|
||||||
|
|
||||||
PID=""
|
|
||||||
query(){
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
|
|
||||||
}
|
|
||||||
|
|
||||||
query
|
|
||||||
if [ x"$PID" != x"" ]; then
|
|
||||||
kill -TERM $PID
|
|
||||||
echo "$AppName (pid:$PID) exiting..."
|
|
||||||
while [ x"$PID" != x"" ]
|
|
||||||
do
|
|
||||||
sleep 1
|
|
||||||
query
|
|
||||||
done
|
|
||||||
echo "$AppName exited."
|
|
||||||
else
|
|
||||||
echo "$AppName already stopped."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function restart()
|
|
||||||
{
|
|
||||||
stop
|
|
||||||
sleep 2
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
function status()
|
|
||||||
{
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
|
|
||||||
if [ $PID != 0 ];then
|
|
||||||
echo "$AppName is running..."
|
|
||||||
else
|
|
||||||
echo "$AppName is not running..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
start)
|
|
||||||
start;;
|
|
||||||
stop)
|
|
||||||
stop;;
|
|
||||||
restart)
|
|
||||||
restart;;
|
|
||||||
status)
|
|
||||||
status;;
|
|
||||||
*)
|
|
||||||
|
|
||||||
esac
|
|
||||||
-3395
File diff suppressed because it is too large.
Load diff
@@ -1,146 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>supplier</artifactId>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<artifactId>supplier-admin</artifactId>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
web服务入口
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- SpringBoot集成thymeleaf模板 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- spring-boot-devtools -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-devtools</artifactId>
|
|
||||||
<optional>true</optional> <!-- 表示依赖不会传递 -->
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger2-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger2</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.swagger</groupId>
|
|
||||||
<artifactId>swagger-annotations</artifactId>
|
|
||||||
<version>1.5.21</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.swagger</groupId>
|
|
||||||
<artifactId>swagger-models</artifactId>
|
|
||||||
<version>1.5.21</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger2-UI-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Mysql驱动包 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 核心模块-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-framework</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 定时任务-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-quartz</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 代码生成-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>co.yixiang</groupId>
|
|
||||||
<artifactId>supplier-generator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>2.1.1.RELEASE</version>
|
|
||||||
<configuration>
|
|
||||||
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<configuration>
|
|
||||||
<failOnMissingWebXml>false</failOnMissingWebXml>
|
|
||||||
<warName>${project.artifactId}</warName>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<!-- YUI Compressor (CSS/JS压缩)
|
|
||||||
<plugin>
|
|
||||||
<groupId>net.alchim31.maven</groupId>
|
|
||||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
|
||||||
<version>1.5.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>prepare-package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compress</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<jswarn>false</jswarn>
|
|
||||||
<nosuffix>true</nosuffix>
|
|
||||||
<linebreakpos>50000</linebreakpos>
|
|
||||||
<sourceDirectory>src/main/resources/static</sourceDirectory>
|
|
||||||
<force>true</force>
|
|
||||||
<includes>
|
|
||||||
<include>**/*.js</include>
|
|
||||||
<include>**/*.css</include>
|
|
||||||
</includes>
|
|
||||||
<excludes>
|
|
||||||
<exclude>**/*.min.js</exclude>
|
|
||||||
<exclude>**/*.min.css</exclude>
|
|
||||||
<exclude>**/fileinput.js</exclude>
|
|
||||||
<exclude>**/bootstrap-table/**</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
</plugin> -->
|
|
||||||
</plugins>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package co.yixiang;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 启动程序
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
|
|
||||||
public class AdminApplication
|
|
||||||
{
|
|
||||||
public static void main(String[] args)
|
|
||||||
{
|
|
||||||
// System.setProperty("spring.devtools.restart.enabled", "false");
|
|
||||||
SpringApplication.run(AdminApplication.class, args);
|
|
||||||
System.out.println("(♥◠‿◠)ﾉﾞ ========== ლ(´ڡ`ლ)ﾞ \n" +
|
|
||||||
"\n管理端启动成功 \n官网：https://www.yixiang.co 提供技术支持ﾞ \n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package co.yixiang;
|
|
||||||
|
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* web容器中进行部署
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
public class AdminServletInitializer extends SpringBootServletInitializer
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
|
|
||||||
{
|
|
||||||
return application.sources(AdminApplication.class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
package co.yixiang.web.controller.common;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
import co.yixiang.common.config.RuoYiConfig;
|
|
||||||
import co.yixiang.common.config.ServerConfig;
|
|
||||||
import co.yixiang.common.constant.Constants;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.utils.file.FileUploadUtils;
|
|
||||||
import co.yixiang.common.utils.file.FileUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 通用请求处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
public class CommonController
|
|
||||||
{
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ServerConfig serverConfig;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 通用下载请求
|
|
||||||
*
|
|
||||||
* @param fileName 文件名称
|
|
||||||
* @param delete 是否删除
|
|
||||||
*/
|
|
||||||
@GetMapping("common/download")
|
|
||||||
public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (!FileUtils.checkAllowDownload(fileName))
|
|
||||||
{
|
|
||||||
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
|
|
||||||
}
|
|
||||||
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
|
|
||||||
String filePath = RuoYiConfig.getDownloadPath() + fileName;
|
|
||||||
|
|
||||||
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
|
|
||||||
FileUtils.setAttachmentResponseHeader(response, realFileName);
|
|
||||||
FileUtils.writeBytes(filePath, response.getOutputStream());
|
|
||||||
if (delete)
|
|
||||||
{
|
|
||||||
FileUtils.deleteFile(filePath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("下载文件失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 通用上传请求
|
|
||||||
*/
|
|
||||||
@PostMapping("/common/upload")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult uploadFile(MultipartFile file) throws Exception
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// 上传文件路径
|
|
||||||
String filePath = RuoYiConfig.getUploadPath();
|
|
||||||
// 上传并返回新文件名称
|
|
||||||
String fileName = FileUploadUtils.upload(filePath, file);
|
|
||||||
String url = serverConfig.getUrl() + fileName;
|
|
||||||
AjaxResult ajax = AjaxResult.success();
|
|
||||||
ajax.put("fileName", fileName);
|
|
||||||
ajax.put("url", url);
|
|
||||||
return ajax;
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return AjaxResult.error(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 本地资源通用下载
|
|
||||||
*/
|
|
||||||
@GetMapping("/common/download/resource")
|
|
||||||
public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
|
|
||||||
throws Exception
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (!FileUtils.checkAllowDownload(resource))
|
|
||||||
{
|
|
||||||
throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
|
|
||||||
}
|
|
||||||
// 本地资源路径
|
|
||||||
String localPath = RuoYiConfig.getProfile();
|
|
||||||
// 数据库资源地址
|
|
||||||
String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
|
|
||||||
// 下载名称
|
|
||||||
String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
|
|
||||||
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
|
|
||||||
FileUtils.setAttachmentResponseHeader(response, downloadName);
|
|
||||||
FileUtils.writeBytes(downloadPath, response.getOutputStream());
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("下载文件失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-80
@@ -1,80 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 模态窗口
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/modal")
|
|
||||||
public class DemoDialogController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/modal";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 模态窗口
|
|
||||||
*/
|
|
||||||
@GetMapping("/dialog")
|
|
||||||
public String dialog()
|
|
||||||
{
|
|
||||||
return prefix + "/dialog";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 弹层组件
|
|
||||||
*/
|
|
||||||
@GetMapping("/layer")
|
|
||||||
public String layer()
|
|
||||||
{
|
|
||||||
return prefix + "/layer";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表单
|
|
||||||
*/
|
|
||||||
@GetMapping("/form")
|
|
||||||
public String form()
|
|
||||||
{
|
|
||||||
return prefix + "/form";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格
|
|
||||||
*/
|
|
||||||
@GetMapping("/table")
|
|
||||||
public String table()
|
|
||||||
{
|
|
||||||
return prefix + "/table";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格check
|
|
||||||
*/
|
|
||||||
@GetMapping("/check")
|
|
||||||
public String check()
|
|
||||||
{
|
|
||||||
return prefix + "/table/check";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格radio
|
|
||||||
*/
|
|
||||||
@GetMapping("/radio")
|
|
||||||
public String radio()
|
|
||||||
{
|
|
||||||
return prefix + "/table/radio";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格回传父窗体
|
|
||||||
*/
|
|
||||||
@GetMapping("/parent")
|
|
||||||
public String parent()
|
|
||||||
{
|
|
||||||
return prefix + "/table/parent";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-390
@@ -1,390 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.CxSelect;
|
|
||||||
import co.yixiang.common.json.JSONObject;
|
|
||||||
import co.yixiang.common.json.JSONObject.JSONArray;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表单相关
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/form")
|
|
||||||
public class DemoFormController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/form";
|
|
||||||
|
|
||||||
private final static List<UserFormModel> users = new ArrayList<UserFormModel>();
|
|
||||||
{
|
|
||||||
users.add(new UserFormModel(1, "1000001", "测试1", "15888888888"));
|
|
||||||
users.add(new UserFormModel(2, "1000002", "测试2", "15666666666"));
|
|
||||||
users.add(new UserFormModel(3, "1000003", "测试3", "15666666666"));
|
|
||||||
users.add(new UserFormModel(4, "1000004", "测试4", "15666666666"));
|
|
||||||
users.add(new UserFormModel(5, "1000005", "测试5", "15666666666"));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 按钮页
|
|
||||||
*/
|
|
||||||
@GetMapping("/button")
|
|
||||||
public String button()
|
|
||||||
{
|
|
||||||
return prefix + "/button";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 下拉框
|
|
||||||
*/
|
|
||||||
@GetMapping("/select")
|
|
||||||
public String select()
|
|
||||||
{
|
|
||||||
return prefix + "/select";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 时间轴
|
|
||||||
*/
|
|
||||||
@GetMapping("/timeline")
|
|
||||||
public String timeline()
|
|
||||||
{
|
|
||||||
return prefix + "/timeline";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表单校验
|
|
||||||
*/
|
|
||||||
@GetMapping("/validate")
|
|
||||||
public String validate()
|
|
||||||
{
|
|
||||||
return prefix + "/validate";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 功能扩展（包含文件上传）
|
|
||||||
*/
|
|
||||||
@GetMapping("/jasny")
|
|
||||||
public String jasny()
|
|
||||||
{
|
|
||||||
return prefix + "/jasny";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 拖动排序
|
|
||||||
*/
|
|
||||||
@GetMapping("/sortable")
|
|
||||||
public String sortable()
|
|
||||||
{
|
|
||||||
return prefix + "/sortable";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 单据打印
|
|
||||||
*/
|
|
||||||
@GetMapping("/invoice")
|
|
||||||
public String invoice()
|
|
||||||
{
|
|
||||||
return prefix + "/invoice";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 标签 & 提示
|
|
||||||
*/
|
|
||||||
@GetMapping("/labels_tips")
|
|
||||||
public String labels_tips()
|
|
||||||
{
|
|
||||||
return prefix + "/labels_tips";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选项卡 & 面板
|
|
||||||
*/
|
|
||||||
@GetMapping("/tabs_panels")
|
|
||||||
public String tabs_panels()
|
|
||||||
{
|
|
||||||
return prefix + "/tabs_panels";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 栅格
|
|
||||||
*/
|
|
||||||
@GetMapping("/grid")
|
|
||||||
public String grid()
|
|
||||||
{
|
|
||||||
return prefix + "/grid";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表单向导
|
|
||||||
*/
|
|
||||||
@GetMapping("/wizard")
|
|
||||||
public String wizard()
|
|
||||||
{
|
|
||||||
return prefix + "/wizard";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 文件上传
|
|
||||||
*/
|
|
||||||
@GetMapping("/upload")
|
|
||||||
public String upload()
|
|
||||||
{
|
|
||||||
return prefix + "/upload";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 日期和时间页
|
|
||||||
*/
|
|
||||||
@GetMapping("/datetime")
|
|
||||||
public String datetime()
|
|
||||||
{
|
|
||||||
return prefix + "/datetime";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 左右互选组件
|
|
||||||
*/
|
|
||||||
@GetMapping("/duallistbox")
|
|
||||||
public String duallistbox()
|
|
||||||
{
|
|
||||||
return prefix + "/duallistbox";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 基本表单
|
|
||||||
*/
|
|
||||||
@GetMapping("/basic")
|
|
||||||
public String basic()
|
|
||||||
{
|
|
||||||
return prefix + "/basic";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 卡片列表
|
|
||||||
*/
|
|
||||||
@GetMapping("/cards")
|
|
||||||
public String cards()
|
|
||||||
{
|
|
||||||
return prefix + "/cards";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* summernote 富文本编辑器
|
|
||||||
*/
|
|
||||||
@GetMapping("/summernote")
|
|
||||||
public String summernote()
|
|
||||||
{
|
|
||||||
return prefix + "/summernote";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索自动补全
|
|
||||||
*/
|
|
||||||
@GetMapping("/autocomplete")
|
|
||||||
public String autocomplete()
|
|
||||||
{
|
|
||||||
return prefix + "/autocomplete";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 多级联动下拉
|
|
||||||
*/
|
|
||||||
@GetMapping("/cxselect")
|
|
||||||
public String cxselect(ModelMap mmap)
|
|
||||||
{
|
|
||||||
CxSelect cxSelectTB = new CxSelect();
|
|
||||||
cxSelectTB.setN("淘宝");
|
|
||||||
cxSelectTB.setV("taobao");
|
|
||||||
CxSelect cxSelectTm = new CxSelect();
|
|
||||||
cxSelectTm.setN("天猫");
|
|
||||||
cxSelectTm.setV("tm");
|
|
||||||
CxSelect cxSelectJhs = new CxSelect();
|
|
||||||
cxSelectJhs.setN("聚划算");
|
|
||||||
cxSelectJhs.setV("jhs");
|
|
||||||
List<CxSelect> tmList = new ArrayList<CxSelect>();
|
|
||||||
tmList.add(cxSelectTm);
|
|
||||||
tmList.add(cxSelectJhs);
|
|
||||||
cxSelectTB.setS(tmList);
|
|
||||||
|
|
||||||
CxSelect cxSelectJD = new CxSelect();
|
|
||||||
cxSelectJD.setN("京东");
|
|
||||||
cxSelectJD.setV("jd");
|
|
||||||
CxSelect cxSelectCs = new CxSelect();
|
|
||||||
cxSelectCs.setN("京东超市");
|
|
||||||
cxSelectCs.setV("jdcs");
|
|
||||||
CxSelect cxSelectSx = new CxSelect();
|
|
||||||
cxSelectSx.setN("京东生鲜");
|
|
||||||
cxSelectSx.setV("jdsx");
|
|
||||||
List<CxSelect> jdList = new ArrayList<CxSelect>();
|
|
||||||
jdList.add(cxSelectCs);
|
|
||||||
jdList.add(cxSelectSx);
|
|
||||||
cxSelectJD.setS(jdList);
|
|
||||||
|
|
||||||
List<CxSelect> cxList = new ArrayList<CxSelect>();
|
|
||||||
cxList.add(cxSelectTB);
|
|
||||||
cxList.add(cxSelectJD);
|
|
||||||
|
|
||||||
mmap.put("data", JSON.toJSON(cxList));
|
|
||||||
return prefix + "/cxselect";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 局部刷新
|
|
||||||
*/
|
|
||||||
@GetMapping("/localrefresh")
|
|
||||||
public String localRefresh(ModelMap mmap)
|
|
||||||
{
|
|
||||||
JSONArray list = new JSONArray();
|
|
||||||
JSONObject item = new JSONObject();
|
|
||||||
item.put("name", "这条任务数据是由ModelMap传递到页面的，点击添加按钮后会将这条数据替换为新数据");
|
|
||||||
item.put("type", "默认");
|
|
||||||
item.put("date", "2020.06.10");
|
|
||||||
list.add(item);
|
|
||||||
mmap.put("tasks", list);
|
|
||||||
mmap.put("min", 2);
|
|
||||||
mmap.put("max", 10);
|
|
||||||
return prefix + "/localrefresh";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 局部刷新-添加任务
|
|
||||||
*
|
|
||||||
* @param fragment 页面中的模板名称
|
|
||||||
* @param taskName 任务名称
|
|
||||||
*/
|
|
||||||
@PostMapping("/localrefresh/task")
|
|
||||||
public String localRefreshTask(String fragment, String taskName, ModelMap mmap)
|
|
||||||
{
|
|
||||||
JSONArray list = new JSONArray();
|
|
||||||
JSONObject item = new JSONObject();
|
|
||||||
item.put("name", StringUtils.defaultIfBlank(taskName, "通过电话销售过程中了解各盛市的设备仪器使用、采购情况及相关重要追踪人"));
|
|
||||||
item.put("type", "新增");
|
|
||||||
item.put("date", "2018.06.10");
|
|
||||||
list.add(item);
|
|
||||||
item = new JSONObject();
|
|
||||||
item.put("name", "提高自己电话营销技巧，灵活专业地与客户进行电话交流");
|
|
||||||
item.put("type", "新增");
|
|
||||||
item.put("date", "2018.06.12");
|
|
||||||
list.add(item);
|
|
||||||
mmap.put("tasks", list);
|
|
||||||
return prefix + "/localrefresh::" + fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 模拟数据
|
|
||||||
*/
|
|
||||||
@GetMapping("/cityData")
|
|
||||||
@ResponseBody
|
|
||||||
public String cityData()
|
|
||||||
{
|
|
||||||
String data = "[{\"n\":\"湖南省\",\"s\":[{\"n\":\"长沙市\",\"s\":[{\"n\":\"芙蓉区\"},{\"n\":\"天心区\"},{\"n\":\"岳麓区\"},{\"n\":\"开福区\"},{\"n\":\"雨花区\"},{\"n\":\"望城区\"},{\"n\":\"长沙县\"},{\"n\":\"宁乡县\"},{\"n\":\"浏阳市\"}]},{\"n\":\"株洲市\",\"s\":[{\"n\":\"荷塘区\"},{\"n\":\"芦淞区\"},{\"n\":\"石峰区\"},{\"n\":\"天元区\"},{\"n\":\"株洲县\"},{\"n\":\"攸县\"},{\"n\":\"茶陵县\"},{\"n\":\"炎陵县\"},{\"n\":\"醴陵市\"}]},{\"n\":\"湘潭市\",\"s\":[{\"n\":\"雨湖区\"},{\"n\":\"岳塘区\"},{\"n\":\"湘潭县\"},{\"n\":\"湘乡市\"},{\"n\":\"韶山市\"}]},{\"n\":\"衡阳市\",\"s\":[{\"n\":\"珠晖区\"},{\"n\":\"雁峰区\"},{\"n\":\"石鼓区\"},{\"n\":\"蒸湘区\"},{\"n\":\"南岳区\"},{\"n\":\"衡阳县\"},{\"n\":\"衡南县\"},{\"n\":\"衡山县\"},{\"n\":\"衡东县\"},{\"n\":\"祁东县\"},{\"n\":\"耒阳市\"},{\"n\":\"常宁市\"}]},{\"n\":\"邵阳市\",\"s\":[{\"n\":\"双清区\"},{\"n\":\"大祥区\"},{\"n\":\"北塔区\"},{\"n\":\"邵东县\"},{\"n\":\"新邵县\"},{\"n\":\"邵阳县\"},{\"n\":\"隆回县\"},{\"n\":\"洞口县\"},{\"n\":\"绥宁县\"},{\"n\":\"新宁县\"},{\"n\":\"城步苗族自治县\"},{\"n\":\"武冈市\"}]},{\"n\":\"岳阳市\",\"s\":[{\"n\":\"岳阳楼区\"},{\"n\":\"云溪区\"},{\"n\":\"君山区\"},{\"n\":\"岳阳县\"},{\"n\":\"华容县\"},{\"n\":\"湘阴县\"},{\"n\":\"平江县\"},{\"n\":\"汨罗市\"},{\"n\":\"临湘市\"}]},{\"n\":\"常德市\",\"s\":[{\"n\":\"武陵区\"},{\"n\":\"鼎城区\"},{\"n\":\"安乡县\"},{\"n\":\"汉寿县\"},{\"n\":\"澧县\"},{\"n\":\"临澧县\"},{\"n\":\"桃源县\"},{\"n\":\"石门县\"},{\"n\":\"津市市\"}]},{\"n\":\"张家界市\",\"s\":[{\"n\":\"永定区\"},{\"n\":\"武陵源区\"},{\"n\":\"慈利县\"},{\"n\":\"桑植县\"}]},{\"n\":\"益阳市\",\"s\":[{\"n\":\"资阳区\"},{\"n\":\"赫山区\"},{\"n\":\"南县\"},{\"n\":\"桃江县\"},{\"n\":\"安化县\"},{\"n\":\"沅江市\"}]},{\"n\":\"郴州市\",\"s\":[{\"n\":\"北湖区\"},{\"n\":\"苏仙区\"},{\"n\":\"桂阳县\"},{\"n\":\"宜章县\"},{\"n\":\"永兴县\"},{\"n\":\"嘉禾县\"},{\"n\":\"临武县\"},{\"n\":\"汝城县\"},{\"n\":\"桂东县\"},{\"n\":\"安仁县\"},{\"n\":\"资兴市\"}]},{\"n\":\"永州市\",\"s\":[{\"n\":\"零陵区\"},{\"n\":\"冷水滩区\"},{\"n\":\"祁阳县\"},{\"n\":\"东安县\"},{\"n\":\"双牌县\"},{\"n\":\"道县\"},{\"n\":\"江永县\"},{\"n\":\"宁远县\"},{\"n\":\"蓝山县\"},{\"n\":\"新田县\"},{\"n\":\"江华瑶族自治县\"}]},{\"n\":\"怀化市\",\"s\":[{\"n\":\"鹤城区\"},{\"n\":\"中方县\"},{\"n\":\"沅陵县\"},{\"n\":\"辰溪县\"},{\"n\":\"溆浦县\"},{\"n\":\"会同县\"},{\"n\":\"麻阳苗族自治县\"},{\"n\":\"新晃侗族自治县\"},{\"n\":\"芷江侗族自治县\"},{\"n\":\"靖州苗族侗族自治县\"},{\"n\":\"通道侗族自治县\"},{\"n\":\"洪江市\"}]},{\"n\":\"娄底市\",\"s\":[{\"n\":\"娄星区\"},{\"n\":\"双峰县\"},{\"n\":\"新化县\"},{\"n\":\"冷水江市\"},{\"n\":\"涟源市\"}]},{\"n\":\"湘西土家族苗族自治州\",\"s\":[{\"n\":\"吉首市\"},{\"n\":\"泸溪县\"},{\"n\":\"凤凰县\"},{\"n\":\"花垣县\"},{\"n\":\"保靖县\"},{\"n\":\"古丈县\"},{\"n\":\"永顺县\"},{\"n\":\"龙山县\"}]}]},{\"n\":\"广东省\",\"s\":[{\"n\":\"广州市\",\"s\":[{\"n\":\"荔湾区\"},{\"n\":\"越秀区\"},{\"n\":\"海珠区\"},{\"n\":\"天河区\"},{\"n\":\"白云区\"},{\"n\":\"黄埔区\"},{\"n\":\"番禺区\"},{\"n\":\"花都区\"},{\"n\":\"南沙区\"},{\"n\":\"萝岗区\"},{\"n\":\"增城市\"},{\"n\":\"从化市\"}]},{\"n\":\"韶关市\",\"s\":[{\"n\":\"武江区\"},{\"n\":\"浈江区\"},{\"n\":\"曲江区\"},{\"n\":\"始兴县\"},{\"n\":\"仁化县\"},{\"n\":\"翁源县\"},{\"n\":\"乳源瑶族自治县\"},{\"n\":\"新丰县\"},{\"n\":\"乐昌市\"},{\"n\":\"南雄市\"}]},{\"n\":\"深圳市\",\"s\":[{\"n\":\"罗湖区\"},{\"n\":\"福田区\"},{\"n\":\"南山区\"},{\"n\":\"宝安区\"},{\"n\":\"龙岗区\"},{\"n\":\"盐田区\"}]},{\"n\":\"珠海市\",\"s\":[{\"n\":\"香洲区\"},{\"n\":\"斗门区\"},{\"n\":\"金湾区\"}]},{\"n\":\"汕头市\",\"s\":[{\"n\":\"龙湖区\"},{\"n\":\"金平区\"},{\"n\":\"濠江区\"},{\"n\":\"潮阳区\"},{\"n\":\"潮南区\"},{\"n\":\"澄海区\"},{\"n\":\"南澳县\"}]},{\"n\":\"佛山市\",\"s\":[{\"n\":\"禅城区\"},{\"n\":\"南海区\"},{\"n\":\"顺德区\"},{\"n\":\"三水区\"},{\"n\":\"高明区\"}]},{\"n\":\"江门市\",\"s\":[{\"n\":\"蓬江区\"},{\"n\":\"江海区\"},{\"n\":\"新会区\"},{\"n\":\"台山市\"},{\"n\":\"开平市\"},{\"n\":\"鹤山市\"},{\"n\":\"恩平市\"}]},{\"n\":\"湛江市\",\"s\":[{\"n\":\"赤坎区\"},{\"n\":\"霞山区\"},{\"n\":\"坡头区\"},{\"n\":\"麻章区\"},{\"n\":\"遂溪县\"},{\"n\":\"徐闻县\"},{\"n\":\"廉江市\"},{\"n\":\"雷州市\"},{\"n\":\"吴川市\"}]},{\"n\":\"茂名市\",\"s\":[{\"n\":\"茂南区\"},{\"n\":\"茂港区\"},{\"n\":\"电白县\"},{\"n\":\"高州市\"},{\"n\":\"化州市\"},{\"n\":\"Line truncated
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取用户数据
|
|
||||||
*/
|
|
||||||
@GetMapping("/userModel")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult userModel()
|
|
||||||
{
|
|
||||||
AjaxResult ajax = new AjaxResult();
|
|
||||||
|
|
||||||
ajax.put("code", 200);
|
|
||||||
ajax.put("value", users);
|
|
||||||
return ajax;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取数据集合
|
|
||||||
*/
|
|
||||||
@GetMapping("/collection")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult collection()
|
|
||||||
{
|
|
||||||
String[] array = { "ruoyi 1", "ruoyi 2", "ruoyi 3", "ruoyi 4", "ruoyi 5" };
|
|
||||||
AjaxResult ajax = new AjaxResult();
|
|
||||||
ajax.put("value", array);
|
|
||||||
return ajax;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class UserFormModel
|
|
||||||
{
|
|
||||||
/** 用户ID */
|
|
||||||
private int userId;
|
|
||||||
|
|
||||||
/** 用户编号 */
|
|
||||||
private String userCode;
|
|
||||||
|
|
||||||
/** 用户姓名 */
|
|
||||||
private String userName;
|
|
||||||
|
|
||||||
/** 用户手机 */
|
|
||||||
private String userPhone;
|
|
||||||
|
|
||||||
public UserFormModel()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserFormModel(int userId, String userCode, String userName, String userPhone)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
this.userCode = userCode;
|
|
||||||
this.userName = userName;
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getUserId()
|
|
||||||
{
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserId(int userId)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserCode()
|
|
||||||
{
|
|
||||||
return userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserCode(String userCode)
|
|
||||||
{
|
|
||||||
this.userCode = userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserName()
|
|
||||||
{
|
|
||||||
return userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserName(String userName)
|
|
||||||
{
|
|
||||||
this.userName = userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserPhone()
|
|
||||||
{
|
|
||||||
return userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserPhone(String userPhone)
|
|
||||||
{
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 图标相关
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/icon")
|
|
||||||
public class DemoIconController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/icon";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* FontAwesome图标
|
|
||||||
*/
|
|
||||||
@GetMapping("/fontawesome")
|
|
||||||
public String fontAwesome()
|
|
||||||
{
|
|
||||||
return prefix + "/fontawesome";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Glyphicons图标
|
|
||||||
*/
|
|
||||||
@GetMapping("/glyphicons")
|
|
||||||
public String glyphicons()
|
|
||||||
{
|
|
||||||
return prefix + "/glyphicons";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-329
@@ -1,329 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import co.yixiang.web.controller.demo.domain.CustomerModel;
|
|
||||||
import co.yixiang.web.controller.demo.domain.UserOperateModel;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.PageDomain;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.core.page.TableSupport;
|
|
||||||
import co.yixiang.common.core.text.Convert;
|
|
||||||
import co.yixiang.common.exception.BusinessException;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.web.controller.demo.domain.CustomerModel;
|
|
||||||
import co.yixiang.web.controller.demo.domain.UserOperateModel;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 操作控制
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/operate")
|
|
||||||
public class DemoOperateController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/operate";
|
|
||||||
|
|
||||||
private final static Map<Integer, UserOperateModel> users = new LinkedHashMap<Integer, UserOperateModel>();
|
|
||||||
{
|
|
||||||
users.put(1, new UserOperateModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0"));
|
|
||||||
users.put(2, new UserOperateModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1"));
|
|
||||||
users.put(3, new UserOperateModel(3, "1000003", "测试3", "0", "15666666666", "ry@qq.com", 110.0, "1"));
|
|
||||||
users.put(4, new UserOperateModel(4, "1000004", "测试4", "1", "15666666666", "ry@qq.com", 220.0, "1"));
|
|
||||||
users.put(5, new UserOperateModel(5, "1000005", "测试5", "0", "15666666666", "ry@qq.com", 140.0, "1"));
|
|
||||||
users.put(6, new UserOperateModel(6, "1000006", "测试6", "1", "15666666666", "ry@qq.com", 330.0, "1"));
|
|
||||||
users.put(7, new UserOperateModel(7, "1000007", "测试7", "0", "15666666666", "ry@qq.com", 160.0, "1"));
|
|
||||||
users.put(8, new UserOperateModel(8, "1000008", "测试8", "1", "15666666666", "ry@qq.com", 170.0, "1"));
|
|
||||||
users.put(9, new UserOperateModel(9, "1000009", "测试9", "0", "15666666666", "ry@qq.com", 180.0, "1"));
|
|
||||||
users.put(10, new UserOperateModel(10, "1000010", "测试10", "0", "15666666666", "ry@qq.com", 210.0, "1"));
|
|
||||||
users.put(11, new UserOperateModel(11, "1000011", "测试11", "1", "15666666666", "ry@qq.com", 110.0, "1"));
|
|
||||||
users.put(12, new UserOperateModel(12, "1000012", "测试12", "0", "15666666666", "ry@qq.com", 120.0, "1"));
|
|
||||||
users.put(13, new UserOperateModel(13, "1000013", "测试13", "1", "15666666666", "ry@qq.com", 380.0, "1"));
|
|
||||||
users.put(14, new UserOperateModel(14, "1000014", "测试14", "0", "15666666666", "ry@qq.com", 280.0, "1"));
|
|
||||||
users.put(15, new UserOperateModel(15, "1000015", "测试15", "0", "15666666666", "ry@qq.com", 570.0, "1"));
|
|
||||||
users.put(16, new UserOperateModel(16, "1000016", "测试16", "1", "15666666666", "ry@qq.com", 260.0, "1"));
|
|
||||||
users.put(17, new UserOperateModel(17, "1000017", "测试17", "1", "15666666666", "ry@qq.com", 210.0, "1"));
|
|
||||||
users.put(18, new UserOperateModel(18, "1000018", "测试18", "1", "15666666666", "ry@qq.com", 340.0, "1"));
|
|
||||||
users.put(19, new UserOperateModel(19, "1000019", "测试19", "1", "15666666666", "ry@qq.com", 160.0, "1"));
|
|
||||||
users.put(20, new UserOperateModel(20, "1000020", "测试20", "1", "15666666666", "ry@qq.com", 220.0, "1"));
|
|
||||||
users.put(21, new UserOperateModel(21, "1000021", "测试21", "1", "15666666666", "ry@qq.com", 120.0, "1"));
|
|
||||||
users.put(22, new UserOperateModel(22, "1000022", "测试22", "1", "15666666666", "ry@qq.com", 130.0, "1"));
|
|
||||||
users.put(23, new UserOperateModel(23, "1000023", "测试23", "1", "15666666666", "ry@qq.com", 490.0, "1"));
|
|
||||||
users.put(24, new UserOperateModel(24, "1000024", "测试24", "1", "15666666666", "ry@qq.com", 570.0, "1"));
|
|
||||||
users.put(25, new UserOperateModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1"));
|
|
||||||
users.put(26, new UserOperateModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1"));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格
|
|
||||||
*/
|
|
||||||
@GetMapping("/table")
|
|
||||||
public String table()
|
|
||||||
{
|
|
||||||
return prefix + "/table";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 其他
|
|
||||||
*/
|
|
||||||
@GetMapping("/other")
|
|
||||||
public String other()
|
|
||||||
{
|
|
||||||
return prefix + "/other";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询数据
|
|
||||||
*/
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(UserOperateModel userModel)
|
|
||||||
{
|
|
||||||
TableDataInfo rspData = new TableDataInfo();
|
|
||||||
List<UserOperateModel> userList = new ArrayList<UserOperateModel>(users.values());
|
|
||||||
// 查询条件过滤
|
|
||||||
if (StringUtils.isNotEmpty(userModel.getSearchValue()))
|
|
||||||
{
|
|
||||||
userList.clear();
|
|
||||||
for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet())
|
|
||||||
{
|
|
||||||
if (entry.getValue().getUserName().equals(userModel.getSearchValue()))
|
|
||||||
{
|
|
||||||
userList.add(entry.getValue());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (StringUtils.isNotEmpty(userModel.getUserName()))
|
|
||||||
{
|
|
||||||
userList.clear();
|
|
||||||
for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet())
|
|
||||||
{
|
|
||||||
if (entry.getValue().getUserName().equals(userModel.getUserName()))
|
|
||||||
{
|
|
||||||
userList.add(entry.getValue());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
|
||||||
if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize())
|
|
||||||
{
|
|
||||||
rspData.setRows(userList);
|
|
||||||
rspData.setTotal(userList.size());
|
|
||||||
return rspData;
|
|
||||||
}
|
|
||||||
Integer pageNum = (pageDomain.getPageNum() - 1) * 10;
|
|
||||||
Integer pageSize = pageDomain.getPageNum() * 10;
|
|
||||||
if (pageSize > userList.size())
|
|
||||||
{
|
|
||||||
pageSize = userList.size();
|
|
||||||
}
|
|
||||||
rspData.setRows(userList.subList(pageNum, pageSize));
|
|
||||||
rspData.setTotal(userList.size());
|
|
||||||
return rspData;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add(ModelMap mmap)
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存用户
|
|
||||||
*/
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(UserOperateModel user)
|
|
||||||
{
|
|
||||||
Integer userId = users.size() + 1;
|
|
||||||
user.setUserId(userId);
|
|
||||||
return AjaxResult.success(users.put(userId, user));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存主子表信息
|
|
||||||
*/
|
|
||||||
@PostMapping("/customer/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(CustomerModel customerModel)
|
|
||||||
{
|
|
||||||
System.out.println(customerModel.toString());
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{userId}")
|
|
||||||
public String edit(@PathVariable("userId") Integer userId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("user", users.get(userId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存用户
|
|
||||||
*/
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(UserOperateModel user)
|
|
||||||
{
|
|
||||||
return AjaxResult.success(users.put(user.getUserId(), user));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出
|
|
||||||
*/
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(UserOperateModel user)
|
|
||||||
{
|
|
||||||
List<UserOperateModel> list = new ArrayList<UserOperateModel>(users.values());
|
|
||||||
ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
|
|
||||||
return util.exportExcel(list, "用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 下载模板
|
|
||||||
*/
|
|
||||||
@GetMapping("/importTemplate")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult importTemplate()
|
|
||||||
{
|
|
||||||
ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
|
|
||||||
return util.importTemplateExcel("用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导入数据
|
|
||||||
*/
|
|
||||||
@PostMapping("/importData")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
|
|
||||||
{
|
|
||||||
ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
|
|
||||||
List<UserOperateModel> userList = util.importExcel(file.getInputStream());
|
|
||||||
String message = importUser(userList, updateSupport);
|
|
||||||
return AjaxResult.success(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除用户
|
|
||||||
*/
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
Integer[] userIds = Convert.toIntArray(ids);
|
|
||||||
for (Integer userId : userIds)
|
|
||||||
{
|
|
||||||
users.remove(userId);
|
|
||||||
}
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查看详细
|
|
||||||
*/
|
|
||||||
@GetMapping("/detail/{userId}")
|
|
||||||
public String detail(@PathVariable("userId") Integer userId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("user", users.get(userId));
|
|
||||||
return prefix + "/detail";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/clean")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clean()
|
|
||||||
{
|
|
||||||
users.clear();
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导入用户数据
|
|
||||||
*
|
|
||||||
* @param userList 用户数据列表
|
|
||||||
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public String importUser(List<UserOperateModel> userList, Boolean isUpdateSupport)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNull(userList) || userList.size() == 0)
|
|
||||||
{
|
|
||||||
throw new BusinessException("导入用户数据不能为空！");
|
|
||||||
}
|
|
||||||
int successNum = 0;
|
|
||||||
int failureNum = 0;
|
|
||||||
StringBuilder successMsg = new StringBuilder();
|
|
||||||
StringBuilder failureMsg = new StringBuilder();
|
|
||||||
for (UserOperateModel user : userList)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// 验证是否存在这个用户
|
|
||||||
boolean userFlag = false;
|
|
||||||
for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet())
|
|
||||||
{
|
|
||||||
if (entry.getValue().getUserName().equals(user.getUserName()))
|
|
||||||
{
|
|
||||||
userFlag = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!userFlag)
|
|
||||||
{
|
|
||||||
Integer userId = users.size() + 1;
|
|
||||||
user.setUserId(userId);
|
|
||||||
users.put(userId, user);
|
|
||||||
successNum++;
|
|
||||||
successMsg.append("<br/>" + successNum + "、用户 " + user.getUserName() + " 导入成功");
|
|
||||||
}
|
|
||||||
else if (isUpdateSupport)
|
|
||||||
{
|
|
||||||
users.put(user.getUserId(), user);
|
|
||||||
successNum++;
|
|
||||||
successMsg.append("<br/>" + successNum + "、用户 " + user.getUserName() + " 更新成功");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
failureNum++;
|
|
||||||
failureMsg.append("<br/>" + failureNum + "、用户 " + user.getUserName() + " 已存在");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
failureNum++;
|
|
||||||
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
|
|
||||||
failureMsg.append(msg + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (failureNum > 0)
|
|
||||||
{
|
|
||||||
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
|
|
||||||
throw new BusinessException(failureMsg.toString());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
|
|
||||||
}
|
|
||||||
return successMsg.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-53
@@ -1,53 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 报表
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/report")
|
|
||||||
public class DemoReportController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/report";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 百度ECharts
|
|
||||||
*/
|
|
||||||
@GetMapping("/echarts")
|
|
||||||
public String echarts()
|
|
||||||
{
|
|
||||||
return prefix + "/echarts";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 图表插件
|
|
||||||
*/
|
|
||||||
@GetMapping("/peity")
|
|
||||||
public String peity()
|
|
||||||
{
|
|
||||||
return prefix + "/peity";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 线状图插件
|
|
||||||
*/
|
|
||||||
@GetMapping("/sparkline")
|
|
||||||
public String sparkline()
|
|
||||||
{
|
|
||||||
return prefix + "/sparkline";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 图表组合
|
|
||||||
*/
|
|
||||||
@GetMapping("/metrics")
|
|
||||||
public String metrics()
|
|
||||||
{
|
|
||||||
return prefix + "/metrics";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-590
@@ -1,590 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.controller;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import co.yixiang.common.annotation.Excel;
|
|
||||||
import co.yixiang.common.annotation.Excel.ColumnType;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.PageDomain;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.core.page.TableSupport;
|
|
||||||
import co.yixiang.common.core.text.Convert;
|
|
||||||
import co.yixiang.common.utils.DateUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格相关
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/demo/table")
|
|
||||||
public class DemoTableController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "demo/table";
|
|
||||||
|
|
||||||
private final static List<UserTableModel> users = new ArrayList<UserTableModel>();
|
|
||||||
{
|
|
||||||
users.add(new UserTableModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0"));
|
|
||||||
users.add(new UserTableModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1"));
|
|
||||||
users.add(new UserTableModel(3, "1000003", "测试3", "0", "15666666666", "ry@qq.com", 110.0, "1"));
|
|
||||||
users.add(new UserTableModel(4, "1000004", "测试4", "1", "15666666666", "ry@qq.com", 220.0, "1"));
|
|
||||||
users.add(new UserTableModel(5, "1000005", "测试5", "0", "15666666666", "ry@qq.com", 140.0, "1"));
|
|
||||||
users.add(new UserTableModel(6, "1000006", "测试6", "1", "15666666666", "ry@qq.com", 330.0, "1"));
|
|
||||||
users.add(new UserTableModel(7, "1000007", "测试7", "0", "15666666666", "ry@qq.com", 160.0, "1"));
|
|
||||||
users.add(new UserTableModel(8, "1000008", "测试8", "1", "15666666666", "ry@qq.com", 170.0, "1"));
|
|
||||||
users.add(new UserTableModel(9, "1000009", "测试9", "0", "15666666666", "ry@qq.com", 180.0, "1"));
|
|
||||||
users.add(new UserTableModel(10, "1000010", "测试10", "0", "15666666666", "ry@qq.com", 210.0, "1"));
|
|
||||||
users.add(new UserTableModel(11, "1000011", "测试11", "1", "15666666666", "ry@qq.com", 110.0, "1"));
|
|
||||||
users.add(new UserTableModel(12, "1000012", "测试12", "0", "15666666666", "ry@qq.com", 120.0, "1"));
|
|
||||||
users.add(new UserTableModel(13, "1000013", "测试13", "1", "15666666666", "ry@qq.com", 380.0, "1"));
|
|
||||||
users.add(new UserTableModel(14, "1000014", "测试14", "0", "15666666666", "ry@qq.com", 280.0, "1"));
|
|
||||||
users.add(new UserTableModel(15, "1000015", "测试15", "0", "15666666666", "ry@qq.com", 570.0, "1"));
|
|
||||||
users.add(new UserTableModel(16, "1000016", "测试16", "1", "15666666666", "ry@qq.com", 260.0, "1"));
|
|
||||||
users.add(new UserTableModel(17, "1000017", "测试17", "1", "15666666666", "ry@qq.com", 210.0, "1"));
|
|
||||||
users.add(new UserTableModel(18, "1000018", "测试18", "1", "15666666666", "ry@qq.com", 340.0, "1"));
|
|
||||||
users.add(new UserTableModel(19, "1000019", "测试19", "1", "15666666666", "ry@qq.com", 160.0, "1"));
|
|
||||||
users.add(new UserTableModel(20, "1000020", "测试20", "1", "15666666666", "ry@qq.com", 220.0, "1"));
|
|
||||||
users.add(new UserTableModel(21, "1000021", "测试21", "1", "15666666666", "ry@qq.com", 120.0, "1"));
|
|
||||||
users.add(new UserTableModel(22, "1000022", "测试22", "1", "15666666666", "ry@qq.com", 130.0, "1"));
|
|
||||||
users.add(new UserTableModel(23, "1000023", "测试23", "1", "15666666666", "ry@qq.com", 490.0, "1"));
|
|
||||||
users.add(new UserTableModel(24, "1000024", "测试24", "1", "15666666666", "ry@qq.com", 570.0, "1"));
|
|
||||||
users.add(new UserTableModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1"));
|
|
||||||
users.add(new UserTableModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private final static List<UserTableColumn> columns = new ArrayList<UserTableColumn>();
|
|
||||||
{
|
|
||||||
columns.add(new UserTableColumn("用户ID", "userId"));
|
|
||||||
columns.add(new UserTableColumn("用户编号", "userCode"));
|
|
||||||
columns.add(new UserTableColumn("用户姓名", "userName"));
|
|
||||||
columns.add(new UserTableColumn("用户手机", "userPhone"));
|
|
||||||
columns.add(new UserTableColumn("用户邮箱", "userEmail"));
|
|
||||||
columns.add(new UserTableColumn("用户状态", "status"));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索相关
|
|
||||||
*/
|
|
||||||
@GetMapping("/search")
|
|
||||||
public String search()
|
|
||||||
{
|
|
||||||
return prefix + "/search";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 数据汇总
|
|
||||||
*/
|
|
||||||
@GetMapping("/footer")
|
|
||||||
public String footer()
|
|
||||||
{
|
|
||||||
return prefix + "/footer";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 组合表头
|
|
||||||
*/
|
|
||||||
@GetMapping("/groupHeader")
|
|
||||||
public String groupHeader()
|
|
||||||
{
|
|
||||||
return prefix + "/groupHeader";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格导出
|
|
||||||
*/
|
|
||||||
@GetMapping("/export")
|
|
||||||
public String export()
|
|
||||||
{
|
|
||||||
return prefix + "/export";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格导出选择列
|
|
||||||
*/
|
|
||||||
@GetMapping("/exportSelected")
|
|
||||||
public String exportSelected()
|
|
||||||
{
|
|
||||||
return prefix + "/exportSelected";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出数据
|
|
||||||
*/
|
|
||||||
@PostMapping("/exportData")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult exportSelected(UserTableModel userModel, String userIds)
|
|
||||||
{
|
|
||||||
List<UserTableModel> userList = new ArrayList<UserTableModel>(Arrays.asList(new UserTableModel[users.size()]));
|
|
||||||
Collections.copy(userList, users);
|
|
||||||
|
|
||||||
// 条件过滤
|
|
||||||
if (StringUtils.isNotEmpty(userIds))
|
|
||||||
{
|
|
||||||
userList.clear();
|
|
||||||
for (Long userId : Convert.toLongArray(userIds))
|
|
||||||
{
|
|
||||||
for (UserTableModel user : users)
|
|
||||||
{
|
|
||||||
if (user.getUserId() == userId)
|
|
||||||
{
|
|
||||||
userList.add(user);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ExcelUtil<UserTableModel> util = new ExcelUtil<UserTableModel>(UserTableModel.class);
|
|
||||||
return util.exportExcel(userList, "用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 翻页记住选择
|
|
||||||
*/
|
|
||||||
@GetMapping("/remember")
|
|
||||||
public String remember()
|
|
||||||
{
|
|
||||||
return prefix + "/remember";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 跳转至指定页
|
|
||||||
*/
|
|
||||||
@GetMapping("/pageGo")
|
|
||||||
public String pageGo()
|
|
||||||
{
|
|
||||||
return prefix + "/pageGo";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 自定义查询参数
|
|
||||||
*/
|
|
||||||
@GetMapping("/params")
|
|
||||||
public String params()
|
|
||||||
{
|
|
||||||
return prefix + "/params";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 多表格
|
|
||||||
*/
|
|
||||||
@GetMapping("/multi")
|
|
||||||
public String multi()
|
|
||||||
{
|
|
||||||
return prefix + "/multi";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 点击按钮加载表格
|
|
||||||
*/
|
|
||||||
@GetMapping("/button")
|
|
||||||
public String button()
|
|
||||||
{
|
|
||||||
return prefix + "/button";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 直接加载表格数据
|
|
||||||
*/
|
|
||||||
@GetMapping("/data")
|
|
||||||
public String data(ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("users", users);
|
|
||||||
return prefix + "/data";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格冻结列
|
|
||||||
*/
|
|
||||||
@GetMapping("/fixedColumns")
|
|
||||||
public String fixedColumns()
|
|
||||||
{
|
|
||||||
return prefix + "/fixedColumns";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 自定义触发事件
|
|
||||||
*/
|
|
||||||
@GetMapping("/event")
|
|
||||||
public String event()
|
|
||||||
{
|
|
||||||
return prefix + "/event";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格细节视图
|
|
||||||
*/
|
|
||||||
@GetMapping("/detail")
|
|
||||||
public String detail()
|
|
||||||
{
|
|
||||||
return prefix + "/detail";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格父子视图
|
|
||||||
*/
|
|
||||||
@GetMapping("/child")
|
|
||||||
public String child()
|
|
||||||
{
|
|
||||||
return prefix + "/child";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格图片预览
|
|
||||||
*/
|
|
||||||
@GetMapping("/image")
|
|
||||||
public String image()
|
|
||||||
{
|
|
||||||
return prefix + "/image";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 动态增删改查
|
|
||||||
*/
|
|
||||||
@GetMapping("/curd")
|
|
||||||
public String curd()
|
|
||||||
{
|
|
||||||
return prefix + "/curd";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格行拖拽操作
|
|
||||||
*/
|
|
||||||
@GetMapping("/reorderRows")
|
|
||||||
public String reorderRows()
|
|
||||||
{
|
|
||||||
return prefix + "/reorderRows";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格列拖拽操作
|
|
||||||
*/
|
|
||||||
@GetMapping("/reorderColumns")
|
|
||||||
public String reorderColumns()
|
|
||||||
{
|
|
||||||
return prefix + "/reorderColumns";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格列宽拖动
|
|
||||||
*/
|
|
||||||
@GetMapping("/resizable")
|
|
||||||
public String resizable()
|
|
||||||
{
|
|
||||||
return prefix + "/resizable";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格行内编辑操作
|
|
||||||
*/
|
|
||||||
@GetMapping("/editable")
|
|
||||||
public String editable()
|
|
||||||
{
|
|
||||||
return prefix + "/editable";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 主子表提交
|
|
||||||
*/
|
|
||||||
@GetMapping("/subdata")
|
|
||||||
public String subdata()
|
|
||||||
{
|
|
||||||
return prefix + "/subdata";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格自动刷新
|
|
||||||
*/
|
|
||||||
@GetMapping("/refresh")
|
|
||||||
public String refresh()
|
|
||||||
{
|
|
||||||
return prefix + "/refresh";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格打印配置
|
|
||||||
*/
|
|
||||||
@GetMapping("/print")
|
|
||||||
public String print()
|
|
||||||
{
|
|
||||||
return prefix + "/print";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格标题格式化
|
|
||||||
*/
|
|
||||||
@GetMapping("/headerStyle")
|
|
||||||
public String headerStyle()
|
|
||||||
{
|
|
||||||
return prefix + "/headerStyle";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格动态列
|
|
||||||
*/
|
|
||||||
@GetMapping("/dynamicColumns")
|
|
||||||
public String dynamicColumns()
|
|
||||||
{
|
|
||||||
return prefix + "/dynamicColumns";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 表格其他操作
|
|
||||||
*/
|
|
||||||
@GetMapping("/other")
|
|
||||||
public String other()
|
|
||||||
{
|
|
||||||
return prefix + "/other";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 动态获取列
|
|
||||||
*/
|
|
||||||
@PostMapping("/ajaxColumns")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxColumns(UserTableColumn userColumn)
|
|
||||||
{
|
|
||||||
List<UserTableColumn> columnList = new ArrayList<UserTableColumn>(Arrays.asList(new UserTableColumn[columns.size()]));
|
|
||||||
Collections.copy(columnList, columns);
|
|
||||||
if (userColumn != null && "userBalance".equals(userColumn.getField()))
|
|
||||||
{
|
|
||||||
columnList.add(new UserTableColumn("用户余额", "userBalance"));
|
|
||||||
}
|
|
||||||
return AjaxResult.success(columnList);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询数据
|
|
||||||
*/
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(UserTableModel userModel)
|
|
||||||
{
|
|
||||||
TableDataInfo rspData = new TableDataInfo();
|
|
||||||
List<UserTableModel> userList = new ArrayList<UserTableModel>(Arrays.asList(new UserTableModel[users.size()]));
|
|
||||||
Collections.copy(userList, users);
|
|
||||||
// 查询条件过滤
|
|
||||||
if (StringUtils.isNotEmpty(userModel.getUserName()))
|
|
||||||
{
|
|
||||||
userList.clear();
|
|
||||||
for (UserTableModel user : users)
|
|
||||||
{
|
|
||||||
if (user.getUserName().equals(userModel.getUserName()))
|
|
||||||
{
|
|
||||||
userList.add(user);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
|
||||||
if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize())
|
|
||||||
{
|
|
||||||
rspData.setRows(userList);
|
|
||||||
rspData.setTotal(userList.size());
|
|
||||||
return rspData;
|
|
||||||
}
|
|
||||||
Integer pageNum = (pageDomain.getPageNum() - 1) * 10;
|
|
||||||
Integer pageSize = pageDomain.getPageNum() * 10;
|
|
||||||
if (pageSize > userList.size())
|
|
||||||
{
|
|
||||||
pageSize = userList.size();
|
|
||||||
}
|
|
||||||
rspData.setRows(userList.subList(pageNum, pageSize));
|
|
||||||
rspData.setTotal(userList.size());
|
|
||||||
return rspData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class UserTableColumn
|
|
||||||
{
|
|
||||||
/** 表头 */
|
|
||||||
private String title;
|
|
||||||
/** 字段 */
|
|
||||||
private String field;
|
|
||||||
|
|
||||||
public UserTableColumn()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserTableColumn(String title, String field)
|
|
||||||
{
|
|
||||||
this.title = title;
|
|
||||||
this.field = field;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle()
|
|
||||||
{
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title)
|
|
||||||
{
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getField()
|
|
||||||
{
|
|
||||||
return field;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setField(String field)
|
|
||||||
{
|
|
||||||
this.field = field;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class UserTableModel
|
|
||||||
{
|
|
||||||
/** 用户ID */
|
|
||||||
private int userId;
|
|
||||||
|
|
||||||
/** 用户编号 */
|
|
||||||
@Excel(name = "用户编号", cellType = ColumnType.NUMERIC)
|
|
||||||
private String userCode;
|
|
||||||
|
|
||||||
/** 用户姓名 */
|
|
||||||
@Excel(name = "用户姓名")
|
|
||||||
private String userName;
|
|
||||||
|
|
||||||
/** 用户性别 */
|
|
||||||
private String userSex;
|
|
||||||
|
|
||||||
/** 用户手机 */
|
|
||||||
@Excel(name = "用户手机")
|
|
||||||
private String userPhone;
|
|
||||||
|
|
||||||
/** 用户邮箱 */
|
|
||||||
@Excel(name = "用户邮箱")
|
|
||||||
private String userEmail;
|
|
||||||
|
|
||||||
/** 用户余额 */
|
|
||||||
@Excel(name = "用户余额", cellType = ColumnType.NUMERIC)
|
|
||||||
private double userBalance;
|
|
||||||
|
|
||||||
/** 用户状态（0正常 1停用） */
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
/** 创建时间 */
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
public UserTableModel()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserTableModel(int userId, String userCode, String userName, String userSex, String userPhone,
|
|
||||||
String userEmail, double userBalance, String status)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
this.userCode = userCode;
|
|
||||||
this.userName = userName;
|
|
||||||
this.userSex = userSex;
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
this.userEmail = userEmail;
|
|
||||||
this.userBalance = userBalance;
|
|
||||||
this.status = status;
|
|
||||||
this.createTime = DateUtils.getNowDate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getUserId()
|
|
||||||
{
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserId(int userId)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserCode()
|
|
||||||
{
|
|
||||||
return userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserCode(String userCode)
|
|
||||||
{
|
|
||||||
this.userCode = userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserName()
|
|
||||||
{
|
|
||||||
return userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserName(String userName)
|
|
||||||
{
|
|
||||||
this.userName = userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserSex()
|
|
||||||
{
|
|
||||||
return userSex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserSex(String userSex)
|
|
||||||
{
|
|
||||||
this.userSex = userSex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserPhone()
|
|
||||||
{
|
|
||||||
return userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserPhone(String userPhone)
|
|
||||||
{
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserEmail()
|
|
||||||
{
|
|
||||||
return userEmail;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserEmail(String userEmail)
|
|
||||||
{
|
|
||||||
this.userEmail = userEmail;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getUserBalance()
|
|
||||||
{
|
|
||||||
return userBalance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserBalance(double userBalance)
|
|
||||||
{
|
|
||||||
this.userBalance = userBalance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStatus()
|
|
||||||
{
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(String status)
|
|
||||||
{
|
|
||||||
this.status = status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getCreateTime()
|
|
||||||
{
|
|
||||||
return createTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCreateTime(Date createTime)
|
|
||||||
{
|
|
||||||
this.createTime = createTime;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-116
@@ -1,116 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.domain;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 客户测试信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
public class CustomerModel
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* 客户姓名
|
|
||||||
*/
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 客户手机
|
|
||||||
*/
|
|
||||||
private String phonenumber;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 客户性别
|
|
||||||
*/
|
|
||||||
private String sex;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 客户生日
|
|
||||||
*/
|
|
||||||
private String birthday;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 客户描述
|
|
||||||
*/
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品信息
|
|
||||||
*/
|
|
||||||
private List<GoodsModel> goods;
|
|
||||||
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name)
|
|
||||||
{
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPhonenumber()
|
|
||||||
{
|
|
||||||
return phonenumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhonenumber(String phonenumber)
|
|
||||||
{
|
|
||||||
this.phonenumber = phonenumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public String getSex()
|
|
||||||
{
|
|
||||||
return sex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSex(String sex)
|
|
||||||
{
|
|
||||||
this.sex = sex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getBirthday()
|
|
||||||
{
|
|
||||||
return birthday;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setBirthday(String birthday)
|
|
||||||
{
|
|
||||||
this.birthday = birthday;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getRemark()
|
|
||||||
{
|
|
||||||
return remark;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRemark(String remark)
|
|
||||||
{
|
|
||||||
this.remark = remark;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<GoodsModel> getGoods()
|
|
||||||
{
|
|
||||||
return goods;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGoods(List<GoodsModel> goods)
|
|
||||||
{
|
|
||||||
this.goods = goods;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
|
||||||
.append("name", getName())
|
|
||||||
.append("phonenumber", getPhonenumber())
|
|
||||||
.append("sex", getSex())
|
|
||||||
.append("birthday", getBirthday())
|
|
||||||
.append("goods", getGoods())
|
|
||||||
.append("remark", getRemark())
|
|
||||||
.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.domain;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品测试信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
public class GoodsModel
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* 商品名称
|
|
||||||
*/
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品重量
|
|
||||||
*/
|
|
||||||
private Integer weight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品价格
|
|
||||||
*/
|
|
||||||
private Double price;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品日期
|
|
||||||
*/
|
|
||||||
private Date date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品种类
|
|
||||||
*/
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name)
|
|
||||||
{
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getWeight()
|
|
||||||
{
|
|
||||||
return weight;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setWeight(Integer weight)
|
|
||||||
{
|
|
||||||
this.weight = weight;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getPrice()
|
|
||||||
{
|
|
||||||
return price;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPrice(Double price)
|
|
||||||
{
|
|
||||||
this.price = price;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getDate()
|
|
||||||
{
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDate(Date date)
|
|
||||||
{
|
|
||||||
this.date = date;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getType()
|
|
||||||
{
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setType(String type)
|
|
||||||
{
|
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
|
||||||
.append("name", getName())
|
|
||||||
.append("weight", getWeight())
|
|
||||||
.append("price", getPrice())
|
|
||||||
.append("date", getDate())
|
|
||||||
.append("type", getType())
|
|
||||||
.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-149
@@ -1,149 +0,0 @@
|
|||||||
package co.yixiang.web.controller.demo.domain;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import co.yixiang.common.annotation.Excel;
|
|
||||||
import co.yixiang.common.annotation.Excel.Type;
|
|
||||||
import co.yixiang.common.core.domain.BaseEntity;
|
|
||||||
import co.yixiang.common.utils.DateUtils;
|
|
||||||
|
|
||||||
public class UserOperateModel extends BaseEntity
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
private int userId;
|
|
||||||
|
|
||||||
@Excel(name = "用户编号")
|
|
||||||
private String userCode;
|
|
||||||
|
|
||||||
@Excel(name = "用户姓名")
|
|
||||||
private String userName;
|
|
||||||
|
|
||||||
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
|
|
||||||
private String userSex;
|
|
||||||
|
|
||||||
@Excel(name = "用户手机")
|
|
||||||
private String userPhone;
|
|
||||||
|
|
||||||
@Excel(name = "用户邮箱")
|
|
||||||
private String userEmail;
|
|
||||||
|
|
||||||
@Excel(name = "用户余额")
|
|
||||||
private double userBalance;
|
|
||||||
|
|
||||||
@Excel(name = "用户状态", readConverterExp = "0=正常,1=停用")
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
public UserOperateModel()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserOperateModel(int userId, String userCode, String userName, String userSex, String userPhone,
|
|
||||||
String userEmail, double userBalance, String status)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
this.userCode = userCode;
|
|
||||||
this.userName = userName;
|
|
||||||
this.userSex = userSex;
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
this.userEmail = userEmail;
|
|
||||||
this.userBalance = userBalance;
|
|
||||||
this.status = status;
|
|
||||||
this.createTime = DateUtils.getNowDate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getUserId()
|
|
||||||
{
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserId(int userId)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserCode()
|
|
||||||
{
|
|
||||||
return userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserCode(String userCode)
|
|
||||||
{
|
|
||||||
this.userCode = userCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserName()
|
|
||||||
{
|
|
||||||
return userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserName(String userName)
|
|
||||||
{
|
|
||||||
this.userName = userName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserSex()
|
|
||||||
{
|
|
||||||
return userSex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserSex(String userSex)
|
|
||||||
{
|
|
||||||
this.userSex = userSex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserPhone()
|
|
||||||
{
|
|
||||||
return userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserPhone(String userPhone)
|
|
||||||
{
|
|
||||||
this.userPhone = userPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUserEmail()
|
|
||||||
{
|
|
||||||
return userEmail;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserEmail(String userEmail)
|
|
||||||
{
|
|
||||||
this.userEmail = userEmail;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getUserBalance()
|
|
||||||
{
|
|
||||||
return userBalance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserBalance(double userBalance)
|
|
||||||
{
|
|
||||||
this.userBalance = userBalance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStatus()
|
|
||||||
{
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(String status)
|
|
||||||
{
|
|
||||||
this.status = status;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Date getCreateTime()
|
|
||||||
{
|
|
||||||
return createTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setCreateTime(Date createTime)
|
|
||||||
{
|
|
||||||
this.createTime = createTime;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.framework.web.service.CacheService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 缓存监控
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/cache")
|
|
||||||
public class CacheController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "monitor/cache";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private CacheService cacheService;
|
|
||||||
|
|
||||||
@GetMapping()
|
|
||||||
public String cache(ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("cacheNames", cacheService.getCacheNames());
|
|
||||||
return prefix + "/cache";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/getNames")
|
|
||||||
public String getCacheNames(String fragment, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("cacheNames", cacheService.getCacheNames());
|
|
||||||
return prefix + "/cache::" + fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/getKeys")
|
|
||||||
public String getCacheKeys(String fragment, String cacheName, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("cacheName", cacheName);
|
|
||||||
mmap.put("cacheKyes", cacheService.getCacheKeys(cacheName));
|
|
||||||
return prefix + "/cache::" + fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/getValue")
|
|
||||||
public String getCacheValue(String fragment, String cacheName, String cacheKey, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("cacheName", cacheName);
|
|
||||||
mmap.put("cacheKey", cacheKey);
|
|
||||||
mmap.put("cacheValue", cacheService.getCacheValue(cacheName, cacheKey));
|
|
||||||
return prefix + "/cache::" + fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/clearCacheName")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clearCacheName(String cacheName, ModelMap mmap)
|
|
||||||
{
|
|
||||||
cacheService.clearCacheName(cacheName);
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/clearCacheKey")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clearCacheKey(String cacheName, String cacheKey, ModelMap mmap)
|
|
||||||
{
|
|
||||||
cacheService.clearCacheKey(cacheName, cacheKey);
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/clearAll")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clearAll(ModelMap mmap)
|
|
||||||
{
|
|
||||||
cacheService.clearAll();
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* druid 监控
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/data")
|
|
||||||
public class DruidController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "/druid";
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:data:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String index()
|
|
||||||
{
|
|
||||||
return redirect(prefix + "/index.html");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.framework.web.domain.Server;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 服务器监控
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/server")
|
|
||||||
public class ServerController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "monitor/server";
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:server:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String server(ModelMap mmap) throws Exception
|
|
||||||
{
|
|
||||||
Server server = new Server();
|
|
||||||
server.copyTo();
|
|
||||||
mmap.put("server", server);
|
|
||||||
return prefix + "/server";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-94
@@ -1,94 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import co.yixiang.framework.shiro.service.SysPasswordService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.system.domain.SysLogininfor;
|
|
||||||
import co.yixiang.system.service.ISysLogininforService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 系统访问记录
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/logininfor")
|
|
||||||
public class SysLogininforController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "monitor/logininfor";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysLogininforService logininforService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysPasswordService passwordService;
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:logininfor:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String logininfor()
|
|
||||||
{
|
|
||||||
return prefix + "/logininfor";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:logininfor:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysLogininfor logininfor)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "登录日志", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("monitor:logininfor:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysLogininfor logininfor)
|
|
||||||
{
|
|
||||||
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
|
|
||||||
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
|
|
||||||
return util.exportExcel(list, "登录日志");
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:logininfor:remove")
|
|
||||||
@Log(title = "登录日志", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(logininforService.deleteLogininforByIds(ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:logininfor:remove")
|
|
||||||
@Log(title = "登录日志", businessType = BusinessType.CLEAN)
|
|
||||||
@PostMapping("/clean")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clean()
|
|
||||||
{
|
|
||||||
logininforService.cleanLogininfor();
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:logininfor:unlock")
|
|
||||||
@Log(title = "账户解锁", businessType = BusinessType.OTHER)
|
|
||||||
@PostMapping("/unlock")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult unlock(String loginName)
|
|
||||||
{
|
|
||||||
passwordService.clearLoginRecordCache(loginName);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-90
@@ -1,90 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.system.domain.SysOperLog;
|
|
||||||
import co.yixiang.system.service.ISysOperLogService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 操作日志记录
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/operlog")
|
|
||||||
public class SysOperlogController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "monitor/operlog";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysOperLogService operLogService;
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:operlog:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String operlog()
|
|
||||||
{
|
|
||||||
return prefix + "/operlog";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:operlog:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysOperLog operLog)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "操作日志", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("monitor:operlog:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysOperLog operLog)
|
|
||||||
{
|
|
||||||
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
|
|
||||||
ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
|
|
||||||
return util.exportExcel(list, "操作日志");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "操作日志", businessType = BusinessType.DELETE)
|
|
||||||
@RequiresPermissions("monitor:operlog:remove")
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(operLogService.deleteOperLogByIds(ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:operlog:detail")
|
|
||||||
@GetMapping("/detail/{operId}")
|
|
||||||
public String detail(@PathVariable("operId") Long operId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("operLog", operLogService.selectOperLogById(operId));
|
|
||||||
return prefix + "/detail";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "操作日志", businessType = BusinessType.CLEAN)
|
|
||||||
@RequiresPermissions("monitor:operlog:remove")
|
|
||||||
@PostMapping("/clean")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult clean()
|
|
||||||
{
|
|
||||||
operLogService.cleanOperLog();
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-90
@@ -1,90 +0,0 @@
|
|||||||
package co.yixiang.web.controller.monitor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysUserOnlineService;
|
|
||||||
import org.apache.shiro.authz.annotation.Logical;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.core.text.Convert;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.enums.OnlineStatus;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.framework.shiro.session.OnlineSession;
|
|
||||||
import co.yixiang.framework.shiro.session.OnlineSessionDAO;
|
|
||||||
import co.yixiang.system.domain.SysUserOnline;
|
|
||||||
import co.yixiang.system.service.ISysUserOnlineService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 在线用户监控
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/monitor/online")
|
|
||||||
public class SysUserOnlineController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "monitor/online";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserOnlineService userOnlineService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private OnlineSessionDAO onlineSessionDAO;
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:online:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String online()
|
|
||||||
{
|
|
||||||
return prefix + "/online";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("monitor:online:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysUserOnline userOnline)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysUserOnline> list = userOnlineService.selectUserOnlineList(userOnline);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions(value = { "monitor:online:batchForceLogout", "monitor:online:forceLogout" }, logical = Logical.OR)
|
|
||||||
@Log(title = "在线用户", businessType = BusinessType.FORCE)
|
|
||||||
@PostMapping("/batchForceLogout")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult batchForceLogout(String ids)
|
|
||||||
{
|
|
||||||
for (String sessionId : Convert.toStrArray(ids))
|
|
||||||
{
|
|
||||||
SysUserOnline online = userOnlineService.selectOnlineById(sessionId);
|
|
||||||
if (online == null)
|
|
||||||
{
|
|
||||||
return error("用户已下线");
|
|
||||||
}
|
|
||||||
OnlineSession onlineSession = (OnlineSession) onlineSessionDAO.readSession(online.getSessionId());
|
|
||||||
if (onlineSession == null)
|
|
||||||
{
|
|
||||||
return error("用户已下线");
|
|
||||||
}
|
|
||||||
if (sessionId.equals(ShiroUtils.getSessionId()))
|
|
||||||
{
|
|
||||||
return error("当前登录用户无法强退");
|
|
||||||
}
|
|
||||||
onlineSessionDAO.delete(onlineSession);
|
|
||||||
online.setStatus(OnlineStatus.off_line);
|
|
||||||
userOnlineService.saveOnline(online);
|
|
||||||
userOnlineService.removeUserCache(online.getLoginName(), sessionId);
|
|
||||||
}
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreCoupon;
|
|
||||||
import co.yixiang.shop.service.IStoreCouponService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 优惠券主Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-29
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/coupon")
|
|
||||||
public class StoreCouponController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/coupon";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreCouponService storeCouponService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:coupon:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String coupon()
|
|
||||||
{
|
|
||||||
return prefix + "/coupon";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询优惠券主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:coupon:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreCoupon storeCoupon)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreCoupon> list = storeCouponService.selectStoreCouponList(storeCoupon);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出优惠券主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:coupon:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreCoupon storeCoupon)
|
|
||||||
{
|
|
||||||
List<StoreCoupon> list = storeCouponService.selectStoreCouponList(storeCoupon);
|
|
||||||
ExcelUtil<StoreCoupon> util = new ExcelUtil<StoreCoupon>(StoreCoupon.class);
|
|
||||||
return util.exportExcel(list, "coupon");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增优惠券主
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存优惠券主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:coupon:add")
|
|
||||||
@Log(title = "优惠券主", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreCoupon storeCoupon)
|
|
||||||
{
|
|
||||||
return toAjax(storeCouponService.insertStoreCoupon(storeCoupon));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改优惠券主
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Integer id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreCoupon storeCoupon = storeCouponService.selectStoreCouponById(id);
|
|
||||||
mmap.put("storeCoupon", storeCoupon);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存优惠券主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:coupon:edit")
|
|
||||||
@Log(title = "优惠券主", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreCoupon storeCoupon)
|
|
||||||
{
|
|
||||||
return toAjax(storeCouponService.updateStoreCoupon(storeCoupon));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除优惠券主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:coupon:remove")
|
|
||||||
@Log(title = "优惠券主", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeCouponService.deleteStoreCouponByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreGoodsAttribute;
|
|
||||||
import co.yixiang.shop.service.IStoreGoodsAttributeService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品的属性(独立)Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-24
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/attribute")
|
|
||||||
public class StoreGoodsAttributeController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/attribute";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsAttributeService storeGoodsAttributeService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:attribute:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String attribute()
|
|
||||||
{
|
|
||||||
return prefix + "/attribute";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品的属性(独立)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:attribute:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreGoodsAttribute storeGoodsAttribute)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreGoodsAttribute> list = storeGoodsAttributeService.selectStoreGoodsAttributeList(storeGoodsAttribute);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商品的属性(独立)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:attribute:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreGoodsAttribute storeGoodsAttribute)
|
|
||||||
{
|
|
||||||
List<StoreGoodsAttribute> list = storeGoodsAttributeService.selectStoreGoodsAttributeList(storeGoodsAttribute);
|
|
||||||
ExcelUtil<StoreGoodsAttribute> util = new ExcelUtil<StoreGoodsAttribute>(StoreGoodsAttribute.class);
|
|
||||||
return util.exportExcel(list, "attribute");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商品的属性(独立)
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商品的属性(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:attribute:add")
|
|
||||||
@Log(title = "商品的属性(独立)", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreGoodsAttribute storeGoodsAttribute)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsAttributeService.insertStoreGoodsAttribute(storeGoodsAttribute));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商品的属性(独立)
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{attrId}")
|
|
||||||
public String edit(@PathVariable("attrId") Long attrId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreGoodsAttribute storeGoodsAttribute = storeGoodsAttributeService.selectStoreGoodsAttributeById(attrId);
|
|
||||||
mmap.put("storeGoodsAttribute", storeGoodsAttribute);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商品的属性(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:attribute:edit")
|
|
||||||
@Log(title = "商品的属性(独立)", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreGoodsAttribute storeGoodsAttribute)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsAttributeService.updateStoreGoodsAttribute(storeGoodsAttribute));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除商品的属性(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:attribute:remove")
|
|
||||||
@Log(title = "商品的属性(独立)", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsAttributeService.deleteStoreGoodsAttributeByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreGoodsBrand;
|
|
||||||
import co.yixiang.shop.service.IStoreGoodsBrandService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 产品品牌Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-23
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/brand")
|
|
||||||
public class StoreGoodsBrandController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/brand";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsBrandService storeGoodsBrandService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:brand:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String brand()
|
|
||||||
{
|
|
||||||
return prefix + "/brand";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询产品品牌列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:brand:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreGoodsBrand storeGoodsBrand)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreGoodsBrand> list = storeGoodsBrandService.selectStoreGoodsBrandList(storeGoodsBrand);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出产品品牌列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:brand:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreGoodsBrand storeGoodsBrand)
|
|
||||||
{
|
|
||||||
List<StoreGoodsBrand> list = storeGoodsBrandService.selectStoreGoodsBrandList(storeGoodsBrand);
|
|
||||||
ExcelUtil<StoreGoodsBrand> util = new ExcelUtil<StoreGoodsBrand>(StoreGoodsBrand.class);
|
|
||||||
return util.exportExcel(list, "brand");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增产品品牌
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存产品品牌
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:brand:add")
|
|
||||||
@Log(title = "产品品牌", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreGoodsBrand storeGoodsBrand)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsBrandService.insertStoreGoodsBrand(storeGoodsBrand));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改产品品牌
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreGoodsBrand storeGoodsBrand = storeGoodsBrandService.selectStoreGoodsBrandById(id);
|
|
||||||
mmap.put("storeGoodsBrand", storeGoodsBrand);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存产品品牌
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:brand:edit")
|
|
||||||
@Log(title = "产品品牌", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreGoodsBrand storeGoodsBrand)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsBrandService.updateStoreGoodsBrand(storeGoodsBrand));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除产品品牌
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:brand:remove")
|
|
||||||
@Log(title = "产品品牌", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsBrandService.deleteStoreGoodsBrandByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-153
@@ -1,153 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreGoodsCate;
|
|
||||||
import co.yixiang.shop.service.IStoreGoodsCateService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.core.domain.Ztree;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商城商品分类Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-22
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/cate")
|
|
||||||
public class StoreGoodsCateController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/cate";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsCateService storeGoodsCateService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:cate:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String cate()
|
|
||||||
{
|
|
||||||
return prefix + "/cate";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商城商品分类树列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:cate:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public List<StoreGoodsCate> list(StoreGoodsCate storeGoodsCate)
|
|
||||||
{
|
|
||||||
List<StoreGoodsCate> list = storeGoodsCateService.selectStoreGoodsCateList(storeGoodsCate);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商城商品分类列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:cate:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreGoodsCate storeGoodsCate)
|
|
||||||
{
|
|
||||||
List<StoreGoodsCate> list = storeGoodsCateService.selectStoreGoodsCateList(storeGoodsCate);
|
|
||||||
ExcelUtil<StoreGoodsCate> util = new ExcelUtil<StoreGoodsCate>(StoreGoodsCate.class);
|
|
||||||
return util.exportExcel(list, "cate");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商城商品分类
|
|
||||||
*/
|
|
||||||
@GetMapping(value = { "/add/{id}", "/add/" })
|
|
||||||
public String add(@PathVariable(value = "id", required = false) Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNotNull(id))
|
|
||||||
{
|
|
||||||
mmap.put("storeGoodsCate", storeGoodsCateService.selectStoreGoodsCateById(id));
|
|
||||||
}
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商城商品分类
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:cate:add")
|
|
||||||
@Log(title = "商城商品分类", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreGoodsCate storeGoodsCate)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsCateService.insertStoreGoodsCate(storeGoodsCate));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商城商品分类
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreGoodsCate storeGoodsCate = storeGoodsCateService.selectStoreGoodsCateById(id);
|
|
||||||
mmap.put("storeGoodsCate", storeGoodsCate);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商城商品分类
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:cate:edit")
|
|
||||||
@Log(title = "商城商品分类", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreGoodsCate storeGoodsCate)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsCateService.updateStoreGoodsCate(storeGoodsCate));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:cate:remove")
|
|
||||||
@Log(title = "商城商品分类", businessType = BusinessType.DELETE)
|
|
||||||
@GetMapping("/remove/{id}")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(@PathVariable("id") Long id)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsCateService.deleteStoreGoodsCateById(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择商城商品分类树
|
|
||||||
*/
|
|
||||||
@GetMapping(value = { "/selectCateTree/{id}", "/selectCateTree/" })
|
|
||||||
public String selectCateTree(@PathVariable(value = "id", required = false) Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNotNull(id))
|
|
||||||
{
|
|
||||||
mmap.put("storeGoodsCate", storeGoodsCateService.selectStoreGoodsCateById(id));
|
|
||||||
}
|
|
||||||
return prefix + "/tree";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载商城商品分类树列表
|
|
||||||
*/
|
|
||||||
@GetMapping("/treeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> treeData()
|
|
||||||
{
|
|
||||||
List<Ztree> ztrees = storeGoodsCateService.selectStoreGoodsCateTree();
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-513
@@ -1,513 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.text.MessageFormat;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import co.yixiang.shop.domain.*;
|
|
||||||
import co.yixiang.shop.service.*;
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.shop.domain.*;
|
|
||||||
import co.yixiang.shop.service.*;
|
|
||||||
import co.yixiang.shop.vo.SpecVO;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品主Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-25
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/goods")
|
|
||||||
public class StoreGoodsController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/goods";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsService storeGoodsService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsTypeService storeGoodsTypeService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreSpecService storeSpecService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreSpecItemService storeSpecItemService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsAttributeService storeGoodsAttributeService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
protected IStoreGoodsAttrService storeGoodsAttrService;
|
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreSpecGoodsPriceService storeSpecGoodsPriceService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsCateService storeGoodsCateService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:goods:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String goods()
|
|
||||||
{
|
|
||||||
return prefix + "/goods";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:goods:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreGoods storeGoods)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreGoods> list = storeGoodsService.selectStoreGoodsList(storeGoods);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商品主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:goods:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreGoods storeGoods)
|
|
||||||
{
|
|
||||||
List<StoreGoods> list = storeGoodsService.selectStoreGoodsList(storeGoods);
|
|
||||||
ExcelUtil<StoreGoods> util = new ExcelUtil<StoreGoods>(StoreGoods.class);
|
|
||||||
return util.exportExcel(list, "goods");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商品主
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商品主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:goods:add")
|
|
||||||
@Log(title = "商品主", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreGoods storeGoods)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsService.insertStoreGoods(storeGoods));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param goodsId
|
|
||||||
* @param typeId
|
|
||||||
* @param mmap
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping("/editSpec/{goodsId}/{typeId}")
|
|
||||||
public String editSpecAttr(@PathVariable("goodsId") Integer goodsId,
|
|
||||||
@PathVariable("typeId") Integer typeId,
|
|
||||||
ModelMap mmap){
|
|
||||||
|
|
||||||
StoreGoods storeGoods = storeGoodsService.selectStoreGoodsById(goodsId);
|
|
||||||
|
|
||||||
//StoreGoodsType goodsType = new StoreGoodsType();
|
|
||||||
//goodsType.setId(typeId);
|
|
||||||
List<StoreGoodsType> typeList = storeGoodsTypeService.selectStoreGoodsTypeList(null);
|
|
||||||
//System.out.println(typeList);
|
|
||||||
mmap.put("storeGoods", storeGoods);
|
|
||||||
mmap.put("goodsTypes",typeList);
|
|
||||||
return prefix + "/spec";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param goodsId
|
|
||||||
* @param typeId
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PostMapping("/ajaxSpec")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxSpec(@RequestParam(value = "goods_id",defaultValue = "-1") Integer goodsId,
|
|
||||||
@RequestParam(value = "type_id",defaultValue = "0") Integer typeId){
|
|
||||||
|
|
||||||
//System.out.println("typeId:"+typeId);
|
|
||||||
if(typeId == 0) return AjaxResult.success("success","");
|
|
||||||
StoreSpec storeSpec = new StoreSpec();
|
|
||||||
storeSpec.setTypeId(typeId.longValue());
|
|
||||||
List<StoreSpec> specs = storeSpecService.selectStoreSpecList(storeSpec);
|
|
||||||
List<StoreSpecItem> specItems = null;
|
|
||||||
StoreSpecItem specItem = new StoreSpecItem();
|
|
||||||
for (StoreSpec spec : specs) {
|
|
||||||
specItem.setSpecId(spec.getId());
|
|
||||||
specItems = storeSpecItemService.selectStoreSpecItemList(specItem);
|
|
||||||
//System.out.println("goodsID:"+goodsId);
|
|
||||||
if(goodsId > 0){
|
|
||||||
String itemStr = storeGoodsService.getGoodsItems(goodsId.longValue());
|
|
||||||
if(StringUtils.isNotEmpty(itemStr)){
|
|
||||||
String[] strs = itemStr.split("_");
|
|
||||||
for (StoreSpecItem item : specItems) {
|
|
||||||
if(Arrays.asList(strs).contains(item.getId().toString())){
|
|
||||||
item.setSelected(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
spec.setStoreSpecItems(specItems);
|
|
||||||
}
|
|
||||||
|
|
||||||
HashMap<String,Object> map = new HashMap<>();
|
|
||||||
map.put("data",specs);
|
|
||||||
//System.out.println(specs);
|
|
||||||
return AjaxResult.success("success",map);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param goodsId
|
|
||||||
* @param typeId
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PostMapping("/ajaxGetAttrInput")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxGetAttrInput(@RequestParam(value = "goods_id",defaultValue = "0") Integer goodsId,
|
|
||||||
@RequestParam(value = "type_id",defaultValue = "0") Integer typeId){
|
|
||||||
|
|
||||||
if(typeId == 0) return AjaxResult.success("success","");
|
|
||||||
StoreGoodsAttribute attribute = new StoreGoodsAttribute();
|
|
||||||
attribute.setTypeId(typeId);
|
|
||||||
List<StoreGoodsAttribute> attributeList = storeGoodsAttributeService
|
|
||||||
.selectStoreGoodsAttributeList(attribute);
|
|
||||||
//System.out.println("attributeList:"+attributeList);
|
|
||||||
String str = "";
|
|
||||||
StoreGoodsAttr storeGoodsAttr = null;
|
|
||||||
StoreGoodsAttr goodsAttrOption = new StoreGoodsAttr();
|
|
||||||
goodsAttrOption.setGoodsId(goodsId);
|
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
|
||||||
for (StoreGoodsAttribute attr : attributeList) {
|
|
||||||
goodsAttrOption.setAttrId(attr.getAttrId().intValue());
|
|
||||||
List<StoreGoodsAttr> goodsAttrList = storeGoodsAttrService
|
|
||||||
.selectStoreGoodsAttrList(goodsAttrOption);
|
|
||||||
|
|
||||||
if(goodsAttrList.isEmpty()){
|
|
||||||
StoreGoodsAttr emptyAttr = new StoreGoodsAttr();
|
|
||||||
emptyAttr.setGoodsId(0);
|
|
||||||
emptyAttr.setAttrId(0);
|
|
||||||
emptyAttr.setGoodsAttrId(0);
|
|
||||||
emptyAttr.setAttrValue("无");
|
|
||||||
emptyAttr.setAttrPrice("");
|
|
||||||
goodsAttrList.add(emptyAttr);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (StoreGoodsAttr goodsAttr : goodsAttrList) {
|
|
||||||
//str = String.format("<tr class='attr_{}'>",attr.getAttrId());
|
|
||||||
stringBuilder.append(MessageFormat.format("<tr class=attr_{0}>",attr.getAttrId()));
|
|
||||||
//System.out.println(attr.getAttrId());
|
|
||||||
stringBuilder.append(MessageFormat.format("<td>{0}</td> <td>",attr.getAttrName()));
|
|
||||||
stringBuilder.append(MessageFormat.format("<input class='layui-input' type='text' size='40' value={0} name=attr_{1}[] />",
|
|
||||||
goodsAttr.getAttrValue(),attr.getAttrId()));
|
|
||||||
|
|
||||||
stringBuilder.append("</td></tr>");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
str = stringBuilder.toString();
|
|
||||||
|
|
||||||
|
|
||||||
return AjaxResult.success("success",str);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/ajaxGetSpecInput")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxGetSpecInput(@RequestBody String jsonStr){
|
|
||||||
|
|
||||||
SpecVO data=JSON.parseObject(jsonStr,SpecVO.class);
|
|
||||||
|
|
||||||
//Map<String,Object> map = (Map<String,Object>)jsonObject;
|
|
||||||
Map<String,List<Integer>> map2 = new HashMap<>();
|
|
||||||
//重新组合map有相同键值的组合成list
|
|
||||||
for (String str : data.getList()) {
|
|
||||||
Map<String,Object> map = (Map<String,Object>)JSONObject.parseObject(str);
|
|
||||||
String newKey = map.get("specId").toString();
|
|
||||||
String newValue = map.get("itemId").toString();
|
|
||||||
List<Integer> tmpList = new ArrayList<>();
|
|
||||||
if(map2.containsKey(newKey)){
|
|
||||||
tmpList = map2.get(newKey);
|
|
||||||
tmpList.add(Integer.parseInt(newValue));
|
|
||||||
map2.put(newKey,tmpList);
|
|
||||||
|
|
||||||
}else{
|
|
||||||
tmpList.add(Integer.parseInt(newValue));
|
|
||||||
map2.put(newKey,tmpList);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Iterator<Map.Entry<String, List<Integer>>> it = map2.entrySet().iterator();
|
|
||||||
|
|
||||||
Map<String, Integer> unsortMap =
|
|
||||||
new HashMap<String, Integer>();
|
|
||||||
|
|
||||||
//迭代map把原来值换成列表大小
|
|
||||||
while (it.hasNext()){
|
|
||||||
Map.Entry<String, List<Integer>> entry = it.next();
|
|
||||||
unsortMap.put(entry.getKey(),entry.getValue().size());
|
|
||||||
}
|
|
||||||
|
|
||||||
//定义一个有序的列表map
|
|
||||||
Map<String, Integer> sortMap = new LinkedHashMap<>();
|
|
||||||
|
|
||||||
//升序排序
|
|
||||||
Stream<Map.Entry<String, Integer>> st = unsortMap.entrySet().stream();
|
|
||||||
st.sorted(Comparator.comparing(e -> e.getValue()))
|
|
||||||
.forEachOrdered(e -> sortMap.put(e.getKey(), e.getValue()));
|
|
||||||
|
|
||||||
//根据排序后组合最终的MAP
|
|
||||||
Map<String, List<Integer>> finalMap = new LinkedHashMap<>();
|
|
||||||
for(String key : sortMap.keySet()){
|
|
||||||
finalMap.put(key,map2.get(key));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//列表笛卡儿积
|
|
||||||
ArrayList ls = new ArrayList();
|
|
||||||
for(List<Integer> value : finalMap.values()){
|
|
||||||
ls.add(value);
|
|
||||||
}
|
|
||||||
if(ls.isEmpty()) return AjaxResult.success("success","");
|
|
||||||
List Dlist = StringUtils.Dikaerji0(ls);
|
|
||||||
|
|
||||||
|
|
||||||
//todo 组合数据
|
|
||||||
String str = "<table class='table table-bordered' id='spec_input_tab'><tr>";;
|
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
|
||||||
stringBuilder.append(str);
|
|
||||||
|
|
||||||
for(String key : finalMap.keySet()){
|
|
||||||
StoreSpec storeSpec = storeSpecService
|
|
||||||
.selectStoreSpecById(Long.valueOf(key));
|
|
||||||
stringBuilder.append(MessageFormat.format("<td><b>{0}</b></td>",
|
|
||||||
storeSpec.getName()));
|
|
||||||
}
|
|
||||||
stringBuilder.append("<td><b>进货价</b></td><td><b>零售价</b></td><td><b>库存</b></td><td><b>操作</b></td></tr>");
|
|
||||||
|
|
||||||
|
|
||||||
//获取商品规格列表
|
|
||||||
StoreSpecGoodsPrice storeSpecGoodsPrice = new StoreSpecGoodsPrice();
|
|
||||||
storeSpecGoodsPrice.setGoodsId(Long.valueOf(data.getGoodsId()));
|
|
||||||
|
|
||||||
//开始迭代笛卡儿积
|
|
||||||
Iterator<ArrayList> iter = Dlist.iterator();
|
|
||||||
while (iter.hasNext()) {
|
|
||||||
//System.out.println(iter.next());
|
|
||||||
List<String> itemName = new ArrayList<>();
|
|
||||||
stringBuilder.append("<tr>");
|
|
||||||
List<Integer> iterList = iter.next();
|
|
||||||
Collections.sort(iterList);
|
|
||||||
iterList.forEach(item-> {
|
|
||||||
StoreSpecItem storeSpecItem = storeSpecItemService
|
|
||||||
.selectStoreSpecItemById(Long.valueOf(item.toString()));
|
|
||||||
stringBuilder.append(MessageFormat.format("<td>{0}</td>",
|
|
||||||
storeSpecItem.getItem()));
|
|
||||||
StoreSpec storeSpec2 = storeSpecService
|
|
||||||
.selectStoreSpecById(Long.valueOf(storeSpecItem.getSpecId()));
|
|
||||||
|
|
||||||
itemName.add(storeSpec2.getName()+":"+storeSpecItem.getItem());
|
|
||||||
});
|
|
||||||
|
|
||||||
String itemKeyStr = org.apache.commons.lang.StringUtils.join(iterList.toArray(), "_");
|
|
||||||
String itemNameStr = org.apache.commons.lang.StringUtils.join(itemName.toArray(), ",");
|
|
||||||
//while (iter.next().forEach();)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
double keyPrice = 0;
|
|
||||||
double keyMarketPrice = 0;
|
|
||||||
int keyStoreCount = 0;
|
|
||||||
|
|
||||||
//获取商品规格价格列表
|
|
||||||
storeSpecGoodsPrice.setKey(itemKeyStr);
|
|
||||||
List<StoreSpecGoodsPrice> storeSpecGoodsPrices = storeSpecGoodsPriceService
|
|
||||||
.selectStoreSpecGoodsPriceList(storeSpecGoodsPrice);
|
|
||||||
|
|
||||||
|
|
||||||
//System.out.println(storeSpecGoodsPrices);
|
|
||||||
if(!storeSpecGoodsPrices.isEmpty()){
|
|
||||||
StoreSpecGoodsPrice goodsPrice = storeSpecGoodsPrices.get(0);
|
|
||||||
if(goodsPrice != null){
|
|
||||||
keyPrice = goodsPrice.getPrice();
|
|
||||||
keyMarketPrice = goodsPrice.getMarketPrice();
|
|
||||||
keyStoreCount = goodsPrice.getStoreCount().intValue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stringBuilder.append(MessageFormat.format("<td><input name=item[{0}][price] value={1} /></td>",
|
|
||||||
itemKeyStr,String.valueOf(keyPrice)));
|
|
||||||
stringBuilder.append(MessageFormat.format("<td><input name=item[{0}][market_price] value={1} /></td>",
|
|
||||||
itemKeyStr,String.valueOf(keyMarketPrice)));
|
|
||||||
stringBuilder.append(MessageFormat.format("<td><input name=item[{0}][store_count] value={1} /></td>",
|
|
||||||
itemKeyStr,String.valueOf(keyStoreCount)));
|
|
||||||
stringBuilder.append(MessageFormat.format("<td>无<input type='hidden' name=item[{0}][key_name] value={1} /></td>",
|
|
||||||
itemKeyStr,itemNameStr));
|
|
||||||
stringBuilder.append("</tr>");
|
|
||||||
//System.out.println(storeSpecGoodsPrices);
|
|
||||||
|
|
||||||
}
|
|
||||||
stringBuilder.append("</table>");
|
|
||||||
|
|
||||||
//str = stringBuilder.toString();
|
|
||||||
return AjaxResult.success("success",stringBuilder.toString());
|
|
||||||
//return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/saveSpecAttr")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult saveSpecAttr(HttpServletRequest request){
|
|
||||||
//获取所有表单参数
|
|
||||||
Enumeration<String> paramNames = request.getParameterNames();
|
|
||||||
Map<String,Map<String,String>> specDataMap = new HashMap<>();
|
|
||||||
Map<String,String> attrDataMap = new HashMap<>();
|
|
||||||
Map<String,String> tmpMap = null;
|
|
||||||
String goodsId = request.getParameter("goodsId");
|
|
||||||
String goodsType = request.getParameter("type_id");
|
|
||||||
if(StringUtils.isEmpty(goodsId) || Integer.valueOf(goodsId) == 0){
|
|
||||||
return AjaxResult.error("参数有误");
|
|
||||||
}
|
|
||||||
if(StringUtils.isEmpty(goodsType) || Integer.valueOf(goodsType) == 0){
|
|
||||||
return AjaxResult.error("请选择模型");
|
|
||||||
}
|
|
||||||
//过滤参数
|
|
||||||
while (paramNames.hasMoreElements()) {
|
|
||||||
String name = paramNames.nextElement();
|
|
||||||
String[] values = request.getParameterValues(name);
|
|
||||||
if(values != null && values.length > 0){
|
|
||||||
StringBuilder builder = new StringBuilder();
|
|
||||||
for (int i = 0; i < values.length; i++) {
|
|
||||||
builder.append(values[i]+" ");
|
|
||||||
}
|
|
||||||
//过滤规格组合新的规格数据集合
|
|
||||||
if(name.contains("item")){
|
|
||||||
String pattern = "item\\[(\\d+[_\\d+]*)]\\[([a-z]+_?[a-z]+)]";
|
|
||||||
//String pattern = "item\\[(\\d+_\\d+)]\\[([a-z]+_?[a-z]+)]";
|
|
||||||
Pattern r = Pattern.compile(pattern);
|
|
||||||
Matcher m = r.matcher(name);
|
|
||||||
if (m.find( )) {
|
|
||||||
String keyOne = m.group(1).trim();
|
|
||||||
System.out.println("keyOne:"+keyOne);
|
|
||||||
String keyTwo = m.group(2).trim();
|
|
||||||
System.out.println("keyTwo:"+keyTwo);
|
|
||||||
String keyValue = builder.toString().trim();
|
|
||||||
|
|
||||||
if(!specDataMap.containsKey(keyOne)){
|
|
||||||
tmpMap = new HashMap<>();
|
|
||||||
}
|
|
||||||
tmpMap.put(keyTwo,keyValue);
|
|
||||||
specDataMap.put(keyOne,tmpMap);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//过滤属性组合新的属性集合
|
|
||||||
if(name.contains("attr_")){
|
|
||||||
String pattern2= "attr_(\\d+)\\[]";
|
|
||||||
Pattern r2 = Pattern.compile(pattern2);
|
|
||||||
Matcher m2 = r2.matcher(name);
|
|
||||||
//System.out.println(name+" : "+builder.toString());
|
|
||||||
if (m2.find( )) {
|
|
||||||
attrDataMap.put(m2.group(1),builder.toString().trim());
|
|
||||||
}else{
|
|
||||||
System.out.println("no");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(specDataMap.isEmpty()){
|
|
||||||
return AjaxResult.error("请选择规格项目");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(attrDataMap.isEmpty()){
|
|
||||||
return AjaxResult.error("请填写商品属性");
|
|
||||||
}
|
|
||||||
|
|
||||||
storeGoodsService.saveSpecAttr(specDataMap,attrDataMap,goodsId,goodsType);
|
|
||||||
|
|
||||||
return AjaxResult.success("操作成功");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商品主
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{goodsId}")
|
|
||||||
public String edit(@PathVariable("goodsId") Integer goodsId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreGoods storeGoods = storeGoodsService.selectStoreGoodsById(goodsId);
|
|
||||||
StoreGoodsCate storeGoodsCate = storeGoodsCateService
|
|
||||||
.selectStoreGoodsCateById(storeGoods.getCateId());
|
|
||||||
storeGoods.setCateName(storeGoodsCate.getCateTitle());
|
|
||||||
mmap.put("storeGoods", storeGoods);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商品主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:goods:edit")
|
|
||||||
@Log(title = "商品主", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreGoods storeGoods)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsService.updateStoreGoods(storeGoods));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除商品主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:goods:remove")
|
|
||||||
@Log(title = "商品主", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsService.deleteStoreGoodsByIds(ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping( "/changeStatus")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult changeStatus(StoreGoods storeGoods){
|
|
||||||
return toAjax(storeGoodsService.updateStoreGoods(storeGoods));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreGoodsType;
|
|
||||||
import co.yixiang.shop.service.IStoreGoodsTypeService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品类型(商品模型)Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-24
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/type")
|
|
||||||
public class StoreGoodsTypeController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/type";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreGoodsTypeService storeGoodsTypeService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:type:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String type()
|
|
||||||
{
|
|
||||||
return prefix + "/type";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品类型(商品模型)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:type:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreGoodsType storeGoodsType)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreGoodsType> list = storeGoodsTypeService.selectStoreGoodsTypeList(storeGoodsType);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商品类型(商品模型)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:type:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreGoodsType storeGoodsType)
|
|
||||||
{
|
|
||||||
List<StoreGoodsType> list = storeGoodsTypeService.selectStoreGoodsTypeList(storeGoodsType);
|
|
||||||
ExcelUtil<StoreGoodsType> util = new ExcelUtil<StoreGoodsType>(StoreGoodsType.class);
|
|
||||||
return util.exportExcel(list, "type");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商品类型(商品模型)
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商品类型(商品模型)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:type:add")
|
|
||||||
@Log(title = "商品类型(商品模型)", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreGoodsType storeGoodsType)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsTypeService.insertStoreGoodsType(storeGoodsType));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商品类型(商品模型)
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Integer id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreGoodsType storeGoodsType = storeGoodsTypeService.selectStoreGoodsTypeById(id);
|
|
||||||
mmap.put("storeGoodsType", storeGoodsType);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商品类型(商品模型)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:type:edit")
|
|
||||||
@Log(title = "商品类型(商品模型)", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreGoodsType storeGoodsType)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsTypeService.updateStoreGoodsType(storeGoodsType));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除商品类型(商品模型)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:type:remove")
|
|
||||||
@Log(title = "商品类型(商品模型)", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeGoodsTypeService.deleteStoreGoodsTypeByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-125
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreMember;
|
|
||||||
import co.yixiang.shop.service.IStoreMemberService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商城会员信息Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-30
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/member")
|
|
||||||
public class StoreMemberController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/member";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreMemberService storeMemberService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:member:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String member()
|
|
||||||
{
|
|
||||||
return prefix + "/member";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商城会员信息列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:member:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreMember storeMember)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreMember> list = storeMemberService.selectStoreMemberList(storeMember);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商城会员信息列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:member:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreMember storeMember)
|
|
||||||
{
|
|
||||||
List<StoreMember> list = storeMemberService.selectStoreMemberList(storeMember);
|
|
||||||
ExcelUtil<StoreMember> util = new ExcelUtil<StoreMember>(StoreMember.class);
|
|
||||||
return util.exportExcel(list, "member");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商城会员信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商城会员信息
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:member:add")
|
|
||||||
@Log(title = "商城会员信息", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreMember storeMember)
|
|
||||||
{
|
|
||||||
return toAjax(storeMemberService.insertStoreMember(storeMember));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商城会员信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreMember storeMember = storeMemberService.selectStoreMemberById(id);
|
|
||||||
mmap.put("storeMember", storeMember);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商城会员信息
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:member:edit")
|
|
||||||
@Log(title = "商城会员信息", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreMember storeMember)
|
|
||||||
{
|
|
||||||
return toAjax(storeMemberService.updateStoreMember(storeMember));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除商城会员信息
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:member:remove")
|
|
||||||
@Log(title = "商城会员信息", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeMemberService.deleteStoreMemberByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-182
@@ -1,182 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreOrder;
|
|
||||||
import co.yixiang.shop.service.IStoreOrderService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单主Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-29
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/order")
|
|
||||||
public class StoreOrderController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/order";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreOrderService storeOrderService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:order:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String order()
|
|
||||||
{
|
|
||||||
return prefix + "/order";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询订单主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:order:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreOrder storeOrder)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
if(storeOrder.getOrderStatus() != null){
|
|
||||||
switch (storeOrder.getOrderStatus()){
|
|
||||||
case -1:
|
|
||||||
storeOrder.setDeleted(1);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setPayStatus(0);
|
|
||||||
storeOrder.setShippingStatus(0);
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setPayStatus(0);
|
|
||||||
storeOrder.setShippingStatus(0);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setShippingStatus(0);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setShippingStatus(1);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setShippingStatus(2);
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(0);
|
|
||||||
storeOrder.setShippingStatus(3);
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(1);
|
|
||||||
storeOrder.setShippingStatus(0);
|
|
||||||
break;
|
|
||||||
case 6:
|
|
||||||
storeOrder.setDeleted(0);
|
|
||||||
storeOrder.setPayStatus(1);
|
|
||||||
storeOrder.setOrderStatus(2);
|
|
||||||
storeOrder.setShippingStatus(0);
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//System.out.println(storeOrder);
|
|
||||||
List<StoreOrder> list = storeOrderService.selectStoreOrderList(storeOrder);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出订单主列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:order:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreOrder storeOrder)
|
|
||||||
{
|
|
||||||
List<StoreOrder> list = storeOrderService.selectStoreOrderList(storeOrder);
|
|
||||||
ExcelUtil<StoreOrder> util = new ExcelUtil<StoreOrder>(StoreOrder.class);
|
|
||||||
return util.exportExcel(list, "order");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增订单主
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存订单主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:order:add")
|
|
||||||
@Log(title = "订单主", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreOrder storeOrder)
|
|
||||||
{
|
|
||||||
return toAjax(storeOrderService.insertStoreOrder(storeOrder));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改订单主
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{orderId}")
|
|
||||||
public String edit(@PathVariable("orderId") Integer orderId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreOrder storeOrder = storeOrderService.selectStoreOrderById(orderId);
|
|
||||||
mmap.put("storeOrder", storeOrder);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存订单主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:order:edit")
|
|
||||||
@Log(title = "订单主", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated StoreOrder storeOrder)
|
|
||||||
{
|
|
||||||
return toAjax(storeOrderService.updateStoreOrder(storeOrder));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除订单主
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:order:remove")
|
|
||||||
@Log(title = "订单主", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeOrderService.deleteStoreOrderByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
package co.yixiang.web.controller.shop;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.shop.domain.StoreSpec;
|
|
||||||
import co.yixiang.shop.service.IStoreSpecService;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品规格(独立)Controller
|
|
||||||
*
|
|
||||||
* @author hupeng
|
|
||||||
* @date 2019-08-25
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/shop/spec")
|
|
||||||
public class StoreSpecController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "shop/spec";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IStoreSpecService storeSpecService;
|
|
||||||
|
|
||||||
@RequiresPermissions("shop:spec:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String spec()
|
|
||||||
{
|
|
||||||
return prefix + "/spec";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品规格(独立)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:spec:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(StoreSpec storeSpec)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<StoreSpec> list = storeSpecService.selectStoreSpecList(storeSpec);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出商品规格(独立)列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:spec:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(StoreSpec storeSpec)
|
|
||||||
{
|
|
||||||
List<StoreSpec> list = storeSpecService.selectStoreSpecList(storeSpec);
|
|
||||||
ExcelUtil<StoreSpec> util = new ExcelUtil<StoreSpec>(StoreSpec.class);
|
|
||||||
return util.exportExcel(list, "spec");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增商品规格(独立)
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存商品规格(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:spec:add")
|
|
||||||
@Log(title = "商品规格(独立)", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(StoreSpec storeSpec)
|
|
||||||
{
|
|
||||||
return toAjax(storeSpecService.insertStoreSpec(storeSpec));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改商品规格(独立)
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{id}")
|
|
||||||
public String edit(@PathVariable("id") Long id, ModelMap mmap)
|
|
||||||
{
|
|
||||||
StoreSpec storeSpec = storeSpecService.selectStoreSpecById(id);
|
|
||||||
mmap.put("storeSpec", storeSpec);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存商品规格(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:spec:edit")
|
|
||||||
@Log(title = "商品规格(独立)", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(StoreSpec storeSpec)
|
|
||||||
{
|
|
||||||
return toAjax(storeSpecService.updateStoreSpec(storeSpec));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除商品规格(独立)
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("shop:spec:remove")
|
|
||||||
@Log(title = "商品规格(独立)", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping( "/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(storeSpecService.deleteStoreSpecByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-92
@@ -1,92 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.IOException;
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import javax.imageio.ImageIO;
|
|
||||||
import javax.servlet.ServletOutputStream;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import javax.servlet.http.HttpSession;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
|
||||||
import com.google.code.kaptcha.Constants;
|
|
||||||
import com.google.code.kaptcha.Producer;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 图片验证码（支持算术形式）
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/captcha")
|
|
||||||
public class SysCaptchaController extends BaseController
|
|
||||||
{
|
|
||||||
@Resource(name = "captchaProducer")
|
|
||||||
private Producer captchaProducer;
|
|
||||||
|
|
||||||
@Resource(name = "captchaProducerMath")
|
|
||||||
private Producer captchaProducerMath;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 验证码生成
|
|
||||||
*/
|
|
||||||
@GetMapping(value = "/captchaImage")
|
|
||||||
public ModelAndView getKaptchaImage(HttpServletRequest request, HttpServletResponse response)
|
|
||||||
{
|
|
||||||
ServletOutputStream out = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
HttpSession session = request.getSession();
|
|
||||||
response.setDateHeader("Expires", 0);
|
|
||||||
response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
|
|
||||||
response.addHeader("Cache-Control", "post-check=0, pre-check=0");
|
|
||||||
response.setHeader("Pragma", "no-cache");
|
|
||||||
response.setContentType("image/jpeg");
|
|
||||||
|
|
||||||
String type = request.getParameter("type");
|
|
||||||
String capStr = null;
|
|
||||||
String code = null;
|
|
||||||
BufferedImage bi = null;
|
|
||||||
if ("math".equals(type))
|
|
||||||
{
|
|
||||||
String capText = captchaProducerMath.createText();
|
|
||||||
capStr = capText.substring(0, capText.lastIndexOf("@"));
|
|
||||||
code = capText.substring(capText.lastIndexOf("@") + 1);
|
|
||||||
bi = captchaProducerMath.createImage(capStr);
|
|
||||||
}
|
|
||||||
else if ("char".equals(type))
|
|
||||||
{
|
|
||||||
capStr = code = captchaProducer.createText();
|
|
||||||
bi = captchaProducer.createImage(capStr);
|
|
||||||
}
|
|
||||||
session.setAttribute(Constants.KAPTCHA_SESSION_KEY, code);
|
|
||||||
out = response.getOutputStream();
|
|
||||||
ImageIO.write(bi, "jpg", out);
|
|
||||||
out.flush();
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (out != null)
|
|
||||||
{
|
|
||||||
out.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-159
@@ -1,159 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysConfigService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.system.domain.SysConfig;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 参数配置 信息操作处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/config")
|
|
||||||
public class SysConfigController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/config";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysConfigService configService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:config:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String config()
|
|
||||||
{
|
|
||||||
return prefix + "/config";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询参数配置列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:config:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysConfig config)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysConfig> list = configService.selectConfigList(config);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:config:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysConfig config)
|
|
||||||
{
|
|
||||||
List<SysConfig> list = configService.selectConfigList(config);
|
|
||||||
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
|
|
||||||
return util.exportExcel(list, "参数数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增参数配置
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存参数配置
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:config:add")
|
|
||||||
@Log(title = "参数管理", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysConfig config)
|
|
||||||
{
|
|
||||||
if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
|
|
||||||
{
|
|
||||||
return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
|
|
||||||
}
|
|
||||||
config.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(configService.insertConfig(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改参数配置
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{configId}")
|
|
||||||
public String edit(@PathVariable("configId") Long configId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("config", configService.selectConfigById(configId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存参数配置
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:config:edit")
|
|
||||||
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysConfig config)
|
|
||||||
{
|
|
||||||
if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
|
|
||||||
{
|
|
||||||
return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
|
|
||||||
}
|
|
||||||
config.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(configService.updateConfig(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除参数配置
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:config:remove")
|
|
||||||
@Log(title = "参数管理", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
configService.deleteConfigByIds(ids);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 刷新参数缓存
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:config:remove")
|
|
||||||
@Log(title = "参数管理", businessType = BusinessType.CLEAN)
|
|
||||||
@GetMapping("/refreshCache")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult refreshCache()
|
|
||||||
{
|
|
||||||
configService.resetConfigCache();
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验参数键名
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkConfigKeyUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkConfigKeyUnique(SysConfig config)
|
|
||||||
{
|
|
||||||
return configService.checkConfigKeyUnique(config);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysDeptService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.Ztree;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysDept;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysRole;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.system.service.ISysDeptService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 部门信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/dept")
|
|
||||||
public class SysDeptController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/dept";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysDeptService deptService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:dept:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String dept()
|
|
||||||
{
|
|
||||||
return prefix + "/dept";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:dept:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public List<SysDept> list(SysDept dept)
|
|
||||||
{
|
|
||||||
List<SysDept> deptList = deptService.selectDeptList(dept);
|
|
||||||
return deptList;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增部门
|
|
||||||
*/
|
|
||||||
@GetMapping("/add/{parentId}")
|
|
||||||
public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
if (!ShiroUtils.getSysUser().isAdmin())
|
|
||||||
{
|
|
||||||
parentId = ShiroUtils.getSysUser().getDeptId();
|
|
||||||
}
|
|
||||||
mmap.put("dept", deptService.selectDeptById(parentId));
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存部门
|
|
||||||
*/
|
|
||||||
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
|
||||||
@RequiresPermissions("system:dept:add")
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysDept dept)
|
|
||||||
{
|
|
||||||
if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
|
|
||||||
{
|
|
||||||
return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
|
|
||||||
}
|
|
||||||
dept.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(deptService.insertDept(dept));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{deptId}")
|
|
||||||
public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysDept dept = deptService.selectDeptById(deptId);
|
|
||||||
if (StringUtils.isNotNull(dept) && 100L == deptId)
|
|
||||||
{
|
|
||||||
dept.setParentName("无");
|
|
||||||
}
|
|
||||||
mmap.put("dept", dept);
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 保存
|
|
||||||
*/
|
|
||||||
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:dept:edit")
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysDept dept)
|
|
||||||
{
|
|
||||||
if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
|
|
||||||
{
|
|
||||||
return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
|
|
||||||
}
|
|
||||||
else if (dept.getParentId().equals(dept.getDeptId()))
|
|
||||||
{
|
|
||||||
return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
|
|
||||||
}
|
|
||||||
else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
|
|
||||||
&& deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
|
|
||||||
{
|
|
||||||
return AjaxResult.error("该部门包含未停用的子部门！");
|
|
||||||
}
|
|
||||||
dept.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(deptService.updateDept(dept));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除
|
|
||||||
*/
|
|
||||||
@Log(title = "部门管理", businessType = BusinessType.DELETE)
|
|
||||||
@RequiresPermissions("system:dept:remove")
|
|
||||||
@GetMapping("/remove/{deptId}")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(@PathVariable("deptId") Long deptId)
|
|
||||||
{
|
|
||||||
if (deptService.selectDeptCount(deptId) > 0)
|
|
||||||
{
|
|
||||||
return AjaxResult.warn("存在下级部门,不允许删除");
|
|
||||||
}
|
|
||||||
if (deptService.checkDeptExistUser(deptId))
|
|
||||||
{
|
|
||||||
return AjaxResult.warn("部门存在用户,不允许删除");
|
|
||||||
}
|
|
||||||
return toAjax(deptService.deleteDeptById(deptId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验部门名称
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkDeptNameUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkDeptNameUnique(SysDept dept)
|
|
||||||
{
|
|
||||||
return deptService.checkDeptNameUnique(dept);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择部门树
|
|
||||||
*
|
|
||||||
* @param deptId 部门ID
|
|
||||||
* @param excludeId 排除ID
|
|
||||||
*/
|
|
||||||
@GetMapping(value = { "/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}" })
|
|
||||||
public String selectDeptTree(@PathVariable("deptId") Long deptId,
|
|
||||||
@PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("dept", deptService.selectDeptById(deptId));
|
|
||||||
mmap.put("excludeId", excludeId);
|
|
||||||
return prefix + "/tree";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载部门列表树
|
|
||||||
*/
|
|
||||||
@GetMapping("/treeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> treeData()
|
|
||||||
{
|
|
||||||
List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载部门列表树（排除下级）
|
|
||||||
*/
|
|
||||||
@GetMapping("/treeData/{excludeId}")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId)
|
|
||||||
{
|
|
||||||
SysDept dept = new SysDept();
|
|
||||||
dept.setDeptId(excludeId);
|
|
||||||
List<Ztree> ztrees = deptService.selectDeptTreeExcludeChild(dept);
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载角色部门（数据权限）列表树
|
|
||||||
*/
|
|
||||||
@GetMapping("/roleDeptTreeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> deptTreeData(SysRole role)
|
|
||||||
{
|
|
||||||
List<Ztree> ztrees = deptService.roleDeptTreeData(role);
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-123
@@ -1,123 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysDictDataService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysDictData;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.system.service.ISysDictDataService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 数据字典信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/dict/data")
|
|
||||||
public class SysDictDataController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/dict/data";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysDictDataService dictDataService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:dict:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String dictData()
|
|
||||||
{
|
|
||||||
return prefix + "/data";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/list")
|
|
||||||
@RequiresPermissions("system:dict:list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysDictData dictData)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:dict:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysDictData dictData)
|
|
||||||
{
|
|
||||||
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
|
|
||||||
ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
|
|
||||||
return util.exportExcel(list, "字典数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增字典类型
|
|
||||||
*/
|
|
||||||
@GetMapping("/add/{dictType}")
|
|
||||||
public String add(@PathVariable("dictType") String dictType, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("dictType", dictType);
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存字典类型
|
|
||||||
*/
|
|
||||||
@Log(title = "字典数据", businessType = BusinessType.INSERT)
|
|
||||||
@RequiresPermissions("system:dict:add")
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysDictData dict)
|
|
||||||
{
|
|
||||||
dict.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(dictDataService.insertDictData(dict));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改字典类型
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{dictCode}")
|
|
||||||
public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("dict", dictDataService.selectDictDataById(dictCode));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存字典类型
|
|
||||||
*/
|
|
||||||
@Log(title = "字典数据", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:dict:edit")
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysDictData dict)
|
|
||||||
{
|
|
||||||
dict.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(dictDataService.updateDictData(dict));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "字典数据", businessType = BusinessType.DELETE)
|
|
||||||
@RequiresPermissions("system:dict:remove")
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
dictDataService.deleteDictDataByIds(ids);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-190
@@ -1,190 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysDictTypeService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.Ztree;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysDictType;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 数据字典信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/dict")
|
|
||||||
public class SysDictTypeController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/dict/type";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysDictTypeService dictTypeService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:dict:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String dictType()
|
|
||||||
{
|
|
||||||
return prefix + "/type";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/list")
|
|
||||||
@RequiresPermissions("system:dict:list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysDictType dictType)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:dict:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysDictType dictType)
|
|
||||||
{
|
|
||||||
|
|
||||||
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
|
|
||||||
ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
|
|
||||||
return util.exportExcel(list, "字典类型");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增字典类型
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存字典类型
|
|
||||||
*/
|
|
||||||
@Log(title = "字典类型", businessType = BusinessType.INSERT)
|
|
||||||
@RequiresPermissions("system:dict:add")
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysDictType dict)
|
|
||||||
{
|
|
||||||
if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
|
|
||||||
{
|
|
||||||
return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
|
|
||||||
}
|
|
||||||
dict.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(dictTypeService.insertDictType(dict));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改字典类型
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{dictId}")
|
|
||||||
public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存字典类型
|
|
||||||
*/
|
|
||||||
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:dict:edit")
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysDictType dict)
|
|
||||||
{
|
|
||||||
if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
|
|
||||||
{
|
|
||||||
return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
|
|
||||||
}
|
|
||||||
dict.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(dictTypeService.updateDictType(dict));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "字典类型", businessType = BusinessType.DELETE)
|
|
||||||
@RequiresPermissions("system:dict:remove")
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
dictTypeService.deleteDictTypeByIds(ids);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 刷新字典缓存
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:dict:remove")
|
|
||||||
@Log(title = "字典类型", businessType = BusinessType.CLEAN)
|
|
||||||
@GetMapping("/refreshCache")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult refreshCache()
|
|
||||||
{
|
|
||||||
dictTypeService.resetDictCache();
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询字典详细
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:dict:list")
|
|
||||||
@GetMapping("/detail/{dictId}")
|
|
||||||
public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
|
|
||||||
mmap.put("dictList", dictTypeService.selectDictTypeAll());
|
|
||||||
return "system/dict/data/data";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验字典类型
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkDictTypeUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkDictTypeUnique(SysDictType dictType)
|
|
||||||
{
|
|
||||||
return dictTypeService.checkDictTypeUnique(dictType);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择字典树
|
|
||||||
*/
|
|
||||||
@GetMapping("/selectDictTree/{columnId}/{dictType}")
|
|
||||||
public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType,
|
|
||||||
ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("columnId", columnId);
|
|
||||||
mmap.put("dict", dictTypeService.selectDictTypeByType(dictType));
|
|
||||||
return prefix + "/tree";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载字典列表树
|
|
||||||
*/
|
|
||||||
@GetMapping("/treeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> treeData()
|
|
||||||
{
|
|
||||||
List<Ztree> ztrees = dictTypeService.selectDictTree(new SysDictType());
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-157
@@ -1,157 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import javax.servlet.http.Cookie;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysConfigService;
|
|
||||||
import co.yixiang.system.service.ISysMenuService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.config.RuoYiConfig;
|
|
||||||
import co.yixiang.common.constant.ShiroConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysMenu;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysUser;
|
|
||||||
import co.yixiang.common.core.text.Convert;
|
|
||||||
import co.yixiang.common.utils.CookieUtils;
|
|
||||||
import co.yixiang.common.utils.DateUtils;
|
|
||||||
import co.yixiang.common.utils.ServletUtils;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.framework.shiro.service.SysPasswordService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 首页 业务处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
public class SysIndexController extends BaseController
|
|
||||||
{
|
|
||||||
@Autowired
|
|
||||||
private ISysMenuService menuService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysConfigService configService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysPasswordService passwordService;
|
|
||||||
|
|
||||||
// 系统首页
|
|
||||||
@GetMapping("/index")
|
|
||||||
public String index(ModelMap mmap)
|
|
||||||
{
|
|
||||||
// 取身份信息
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
// 根据用户id取出菜单
|
|
||||||
List<SysMenu> menus = menuService.selectMenusByUser(user);
|
|
||||||
mmap.put("menus", menus);
|
|
||||||
mmap.put("user", user);
|
|
||||||
mmap.put("sideTheme", configService.selectConfigByKey("sys.index.sideTheme"));
|
|
||||||
mmap.put("skinName", configService.selectConfigByKey("sys.index.skinName"));
|
|
||||||
mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
|
|
||||||
mmap.put("copyrightYear", RuoYiConfig.getCopyrightYear());
|
|
||||||
mmap.put("demoEnabled", RuoYiConfig.isDemoEnabled());
|
|
||||||
mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
|
|
||||||
mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
|
|
||||||
|
|
||||||
// 菜单导航显示风格
|
|
||||||
String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
|
|
||||||
// 移动端，默认使左侧导航菜单，否则取默认配置
|
|
||||||
String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
|
|
||||||
|
|
||||||
// 优先Cookie配置导航菜单
|
|
||||||
Cookie[] cookies = ServletUtils.getRequest().getCookies();
|
|
||||||
for (Cookie cookie : cookies)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName()))
|
|
||||||
{
|
|
||||||
indexStyle = cookie.getValue();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String webIndex = "topnav".equalsIgnoreCase(indexStyle) ? "index-topnav" : "index";
|
|
||||||
return webIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 锁定屏幕
|
|
||||||
@GetMapping("/lockscreen")
|
|
||||||
public String lockscreen(ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("user", ShiroUtils.getSysUser());
|
|
||||||
ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true);
|
|
||||||
return "lock";
|
|
||||||
}
|
|
||||||
|
|
||||||
// 解锁屏幕
|
|
||||||
@PostMapping("/unlockscreen")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult unlockscreen(String password)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
if (StringUtils.isNull(user))
|
|
||||||
{
|
|
||||||
return AjaxResult.error("服务器超时，请重新登陆");
|
|
||||||
}
|
|
||||||
if (passwordService.matches(user, password))
|
|
||||||
{
|
|
||||||
ServletUtils.getSession().removeAttribute(ShiroConstants.LOCK_SCREEN);
|
|
||||||
return AjaxResult.success();
|
|
||||||
}
|
|
||||||
return AjaxResult.error("密码不正确，请重新输入。");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 切换主题
|
|
||||||
@GetMapping("/system/switchSkin")
|
|
||||||
public String switchSkin()
|
|
||||||
{
|
|
||||||
return "skin";
|
|
||||||
}
|
|
||||||
|
|
||||||
// 切换菜单
|
|
||||||
@GetMapping("/system/menuStyle/{style}")
|
|
||||||
public void menuStyle(@PathVariable String style, HttpServletResponse response)
|
|
||||||
{
|
|
||||||
CookieUtils.setCookie(response, "nav-style", style);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 系统介绍
|
|
||||||
@GetMapping("/system/main")
|
|
||||||
public String main(ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("version", RuoYiConfig.getVersion());
|
|
||||||
return "main2";
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查初始密码是否提醒修改
|
|
||||||
public boolean initPasswordIsModify(Date pwdUpdateDate)
|
|
||||||
{
|
|
||||||
Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
|
|
||||||
return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查密码是否过期
|
|
||||||
public boolean passwordIsExpiration(Date pwdUpdateDate)
|
|
||||||
{
|
|
||||||
Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
|
|
||||||
if (passwordValidateDays != null && passwordValidateDays > 0)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNull(pwdUpdateDate))
|
|
||||||
{
|
|
||||||
// 如果从未修改过初始密码，直接提醒过期
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
Date nowDate = DateUtils.getNowDate();
|
|
||||||
return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import org.apache.shiro.SecurityUtils;
|
|
||||||
import org.apache.shiro.authc.AuthenticationException;
|
|
||||||
import org.apache.shiro.authc.UsernamePasswordToken;
|
|
||||||
import org.apache.shiro.subject.Subject;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.ServletUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 登录验证
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
public class SysLoginController extends BaseController
|
|
||||||
{
|
|
||||||
@GetMapping("/login")
|
|
||||||
public String login(HttpServletRequest request, HttpServletResponse response)
|
|
||||||
{
|
|
||||||
// 如果是Ajax请求，返回Json字符串。
|
|
||||||
if (ServletUtils.isAjaxRequest(request))
|
|
||||||
{
|
|
||||||
return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
|
|
||||||
}
|
|
||||||
|
|
||||||
return "login";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/login")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
|
|
||||||
{
|
|
||||||
UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
|
|
||||||
Subject subject = SecurityUtils.getSubject();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
subject.login(token);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
catch (AuthenticationException e)
|
|
||||||
{
|
|
||||||
String msg = "用户或密码错误";
|
|
||||||
if (StringUtils.isNotEmpty(e.getMessage()))
|
|
||||||
{
|
|
||||||
msg = e.getMessage();
|
|
||||||
}
|
|
||||||
return error(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/unauth")
|
|
||||||
public String unauth()
|
|
||||||
{
|
|
||||||
return "error/unauth";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,198 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysMenuService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.Ztree;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysMenu;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysRole;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.framework.shiro.util.AuthorizationUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 菜单信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/menu")
|
|
||||||
public class SysMenuController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/menu";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysMenuService menuService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:menu:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String menu()
|
|
||||||
{
|
|
||||||
return prefix + "/menu";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:menu:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public List<SysMenu> list(SysMenu menu)
|
|
||||||
{
|
|
||||||
Long userId = ShiroUtils.getUserId();
|
|
||||||
List<SysMenu> menuList = menuService.selectMenuList(menu, userId);
|
|
||||||
return menuList;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除菜单
|
|
||||||
*/
|
|
||||||
@Log(title = "菜单管理", businessType = BusinessType.DELETE)
|
|
||||||
@RequiresPermissions("system:menu:remove")
|
|
||||||
@GetMapping("/remove/{menuId}")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(@PathVariable("menuId") Long menuId)
|
|
||||||
{
|
|
||||||
if (menuService.selectCountMenuByParentId(menuId) > 0)
|
|
||||||
{
|
|
||||||
return AjaxResult.warn("存在子菜单,不允许删除");
|
|
||||||
}
|
|
||||||
if (menuService.selectCountRoleMenuByMenuId(menuId) > 0)
|
|
||||||
{
|
|
||||||
return AjaxResult.warn("菜单已分配,不允许删除");
|
|
||||||
}
|
|
||||||
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
||||||
return toAjax(menuService.deleteMenuById(menuId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增
|
|
||||||
*/
|
|
||||||
@GetMapping("/add/{parentId}")
|
|
||||||
public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysMenu menu = null;
|
|
||||||
if (0L != parentId)
|
|
||||||
{
|
|
||||||
menu = menuService.selectMenuById(parentId);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
menu = new SysMenu();
|
|
||||||
menu.setMenuId(0L);
|
|
||||||
menu.setMenuName("主目录");
|
|
||||||
}
|
|
||||||
mmap.put("menu", menu);
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存菜单
|
|
||||||
*/
|
|
||||||
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
|
|
||||||
@RequiresPermissions("system:menu:add")
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysMenu menu)
|
|
||||||
{
|
|
||||||
if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
|
|
||||||
{
|
|
||||||
return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
|
|
||||||
}
|
|
||||||
menu.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
||||||
return toAjax(menuService.insertMenu(menu));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改菜单
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{menuId}")
|
|
||||||
public String edit(@PathVariable("menuId") Long menuId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("menu", menuService.selectMenuById(menuId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存菜单
|
|
||||||
*/
|
|
||||||
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:menu:edit")
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysMenu menu)
|
|
||||||
{
|
|
||||||
if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
|
|
||||||
{
|
|
||||||
return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
|
|
||||||
}
|
|
||||||
menu.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
||||||
return toAjax(menuService.updateMenu(menu));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择菜单图标
|
|
||||||
*/
|
|
||||||
@GetMapping("/icon")
|
|
||||||
public String icon()
|
|
||||||
{
|
|
||||||
return prefix + "/icon";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验菜单名称
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkMenuNameUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkMenuNameUnique(SysMenu menu)
|
|
||||||
{
|
|
||||||
return menuService.checkMenuNameUnique(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载角色菜单列表树
|
|
||||||
*/
|
|
||||||
@GetMapping("/roleMenuTreeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> roleMenuTreeData(SysRole role)
|
|
||||||
{
|
|
||||||
Long userId = ShiroUtils.getUserId();
|
|
||||||
List<Ztree> ztrees = menuService.roleMenuTreeData(role, userId);
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载所有菜单列表树
|
|
||||||
*/
|
|
||||||
@GetMapping("/menuTreeData")
|
|
||||||
@ResponseBody
|
|
||||||
public List<Ztree> menuTreeData()
|
|
||||||
{
|
|
||||||
Long userId = ShiroUtils.getUserId();
|
|
||||||
List<Ztree> ztrees = menuService.menuTreeData(userId);
|
|
||||||
return ztrees;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择菜单树
|
|
||||||
*/
|
|
||||||
@GetMapping("/selectMenuTree/{menuId}")
|
|
||||||
public String selectMenuTree(@PathVariable("menuId") Long menuId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("menu", menuService.selectMenuById(menuId));
|
|
||||||
return prefix + "/tree";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-112
@@ -1,112 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.system.domain.SysNotice;
|
|
||||||
import co.yixiang.system.service.ISysNoticeService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 公告 信息操作处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/notice")
|
|
||||||
public class SysNoticeController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/notice";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysNoticeService noticeService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:notice:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String notice()
|
|
||||||
{
|
|
||||||
return prefix + "/notice";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询公告列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:notice:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysNotice notice)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysNotice> list = noticeService.selectNoticeList(notice);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增公告
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存公告
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:notice:add")
|
|
||||||
@Log(title = "通知公告", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(SysNotice notice)
|
|
||||||
{
|
|
||||||
notice.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(noticeService.insertNotice(notice));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改公告
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{noticeId}")
|
|
||||||
public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("notice", noticeService.selectNoticeById(noticeId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存公告
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:notice:edit")
|
|
||||||
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(SysNotice notice)
|
|
||||||
{
|
|
||||||
notice.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(noticeService.updateNotice(notice));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除公告
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:notice:remove")
|
|
||||||
@Log(title = "通知公告", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(noticeService.deleteNoticeByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,163 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.system.domain.SysPost;
|
|
||||||
import co.yixiang.system.service.ISysPostService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 岗位信息操作处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/post")
|
|
||||||
public class SysPostController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/post";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysPostService postService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:post:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String operlog()
|
|
||||||
{
|
|
||||||
return prefix + "/post";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:post:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysPost post)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysPost> list = postService.selectPostList(post);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:post:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysPost post)
|
|
||||||
{
|
|
||||||
List<SysPost> list = postService.selectPostList(post);
|
|
||||||
ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
|
|
||||||
return util.exportExcel(list, "岗位数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:post:remove")
|
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return toAjax(postService.deletePostByIds(ids));
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return error(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增岗位
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存岗位
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:post:add")
|
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysPost post)
|
|
||||||
{
|
|
||||||
if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
|
|
||||||
{
|
|
||||||
return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
|
|
||||||
}
|
|
||||||
else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
|
|
||||||
{
|
|
||||||
return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
|
|
||||||
}
|
|
||||||
post.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(postService.insertPost(post));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改岗位
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{postId}")
|
|
||||||
public String edit(@PathVariable("postId") Long postId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("post", postService.selectPostById(postId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存岗位
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:post:edit")
|
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysPost post)
|
|
||||||
{
|
|
||||||
if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
|
|
||||||
{
|
|
||||||
return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
|
|
||||||
}
|
|
||||||
else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
|
|
||||||
{
|
|
||||||
return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
|
|
||||||
}
|
|
||||||
post.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(postService.updatePost(post));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验岗位名称
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkPostNameUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkPostNameUnique(SysPost post)
|
|
||||||
{
|
|
||||||
return postService.checkPostNameUnique(post);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验岗位编码
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkPostCodeUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkPostCodeUnique(SysPost post)
|
|
||||||
{
|
|
||||||
return postService.checkPostCodeUnique(post);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-187
@@ -1,187 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysUserService;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.config.RuoYiConfig;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysUser;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.DateUtils;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.utils.file.FileUploadUtils;
|
|
||||||
import co.yixiang.framework.shiro.service.SysPasswordService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 个人信息 业务处理
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/user/profile")
|
|
||||||
public class SysProfileController extends BaseController
|
|
||||||
{
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(SysProfileController.class);
|
|
||||||
|
|
||||||
private String prefix = "system/user/profile";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserService userService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysPasswordService passwordService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 个人信息
|
|
||||||
*/
|
|
||||||
@GetMapping()
|
|
||||||
public String profile(ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
mmap.put("user", user);
|
|
||||||
mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId()));
|
|
||||||
mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId()));
|
|
||||||
return prefix + "/profile";
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/checkPassword")
|
|
||||||
@ResponseBody
|
|
||||||
public boolean checkPassword(String password)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
if (passwordService.matches(user, password))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/resetPwd")
|
|
||||||
public String resetPwd(ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
mmap.put("user", userService.selectUserById(user.getUserId()));
|
|
||||||
return prefix + "/resetPwd";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "重置密码", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/resetPwd")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult resetPwd(String oldPassword, String newPassword)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
if (!passwordService.matches(user, oldPassword))
|
|
||||||
{
|
|
||||||
return error("修改密码失败，旧密码错误");
|
|
||||||
}
|
|
||||||
if (passwordService.matches(user, newPassword))
|
|
||||||
{
|
|
||||||
return error("新密码不能与旧密码相同");
|
|
||||||
}
|
|
||||||
user.setSalt(ShiroUtils.randomSalt());
|
|
||||||
user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
|
|
||||||
user.setPwdUpdateDate(DateUtils.getNowDate());
|
|
||||||
if (userService.resetUserPwd(user) > 0)
|
|
||||||
{
|
|
||||||
ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
return error("修改密码异常，请联系管理员");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit")
|
|
||||||
public String edit(ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
mmap.put("user", userService.selectUserById(user.getUserId()));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改头像
|
|
||||||
*/
|
|
||||||
@GetMapping("/avatar")
|
|
||||||
public String avatar(ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
|
||||||
mmap.put("user", userService.selectUserById(user.getUserId()));
|
|
||||||
return prefix + "/avatar";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改用户
|
|
||||||
*/
|
|
||||||
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/update")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult update(SysUser user)
|
|
||||||
{
|
|
||||||
SysUser currentUser = ShiroUtils.getSysUser();
|
|
||||||
currentUser.setUserName(user.getUserName());
|
|
||||||
currentUser.setEmail(user.getEmail());
|
|
||||||
currentUser.setPhonenumber(user.getPhonenumber());
|
|
||||||
currentUser.setSex(user.getSex());
|
|
||||||
if (StringUtils.isNotEmpty(user.getPhonenumber())
|
|
||||||
&& UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(currentUser)))
|
|
||||||
{
|
|
||||||
return error("修改用户'" + currentUser.getLoginName() + "'失败，手机号码已存在");
|
|
||||||
}
|
|
||||||
else if (StringUtils.isNotEmpty(user.getEmail())
|
|
||||||
&& UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(currentUser)))
|
|
||||||
{
|
|
||||||
return error("修改用户'" + currentUser.getLoginName() + "'失败，邮箱账号已存在");
|
|
||||||
}
|
|
||||||
if (userService.updateUserInfo(currentUser) > 0)
|
|
||||||
{
|
|
||||||
ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId()));
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
return error();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 保存头像
|
|
||||||
*/
|
|
||||||
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/updateAvatar")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult updateAvatar(@RequestParam("avatarfile") MultipartFile file)
|
|
||||||
{
|
|
||||||
SysUser currentUser = ShiroUtils.getSysUser();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (!file.isEmpty())
|
|
||||||
{
|
|
||||||
String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
|
|
||||||
currentUser.setAvatar(avatar);
|
|
||||||
if (userService.updateUserInfo(currentUser) > 0)
|
|
||||||
{
|
|
||||||
ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId()));
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return error();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("修改头像失败！", e);
|
|
||||||
return error(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-47
@@ -1,47 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysUser;
|
|
||||||
import co.yixiang.framework.shiro.service.SysRegisterService;
|
|
||||||
import co.yixiang.system.service.ISysConfigService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 注册验证
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
public class SysRegisterController extends BaseController
|
|
||||||
{
|
|
||||||
@Autowired
|
|
||||||
private SysRegisterService registerService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysConfigService configService;
|
|
||||||
|
|
||||||
@GetMapping("/register")
|
|
||||||
public String register()
|
|
||||||
{
|
|
||||||
return "register";
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/register")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult ajaxRegister(SysUser user)
|
|
||||||
{
|
|
||||||
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
|
|
||||||
{
|
|
||||||
return error("当前系统没有开启注册功能！");
|
|
||||||
}
|
|
||||||
String msg = registerService.register(user);
|
|
||||||
return StringUtils.isEmpty(msg) ? success() : error(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,299 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysRoleService;
|
|
||||||
import co.yixiang.system.service.ISysUserService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysRole;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysUser;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.framework.shiro.util.AuthorizationUtils;
|
|
||||||
import co.yixiang.system.domain.SysUserRole;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 角色信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/role")
|
|
||||||
public class SysRoleController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/role";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysRoleService roleService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserService userService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:role:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String role()
|
|
||||||
{
|
|
||||||
return prefix + "/role";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:role:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysRole role)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysRole> list = roleService.selectRoleList(role);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:role:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysRole role)
|
|
||||||
{
|
|
||||||
List<SysRole> list = roleService.selectRoleList(role);
|
|
||||||
ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
|
|
||||||
return util.exportExcel(list, "角色数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增角色
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add()
|
|
||||||
{
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存角色
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:add")
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysRole role)
|
|
||||||
{
|
|
||||||
if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
|
|
||||||
{
|
|
||||||
return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
|
|
||||||
}
|
|
||||||
else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
|
|
||||||
{
|
|
||||||
return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
|
|
||||||
}
|
|
||||||
role.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
||||||
return toAjax(roleService.insertRole(role));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改角色
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{roleId}")
|
|
||||||
public String edit(@PathVariable("roleId") Long roleId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("role", roleService.selectRoleById(roleId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存角色
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:edit")
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysRole role)
|
|
||||||
{
|
|
||||||
roleService.checkRoleAllowed(role);
|
|
||||||
if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
|
|
||||||
{
|
|
||||||
return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
|
|
||||||
}
|
|
||||||
else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
|
|
||||||
{
|
|
||||||
return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
|
|
||||||
}
|
|
||||||
role.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
||||||
return toAjax(roleService.updateRole(role));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 角色分配数据权限
|
|
||||||
*/
|
|
||||||
@GetMapping("/authDataScope/{roleId}")
|
|
||||||
public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("role", roleService.selectRoleById(roleId));
|
|
||||||
return prefix + "/dataScope";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 保存角色分配数据权限
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:edit")
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/authDataScope")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult authDataScopeSave(SysRole role)
|
|
||||||
{
|
|
||||||
roleService.checkRoleAllowed(role);
|
|
||||||
role.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
if (roleService.authDataScope(role) > 0)
|
|
||||||
{
|
|
||||||
ShiroUtils.setSysUser(userService.selectUserById(ShiroUtils.getSysUser().getUserId()));
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
return error();
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:role:remove")
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(roleService.deleteRoleByIds(ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验角色名称
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkRoleNameUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkRoleNameUnique(SysRole role)
|
|
||||||
{
|
|
||||||
return roleService.checkRoleNameUnique(role);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验角色权限
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkRoleKeyUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkRoleKeyUnique(SysRole role)
|
|
||||||
{
|
|
||||||
return roleService.checkRoleKeyUnique(role);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择菜单树
|
|
||||||
*/
|
|
||||||
@GetMapping("/selectMenuTree")
|
|
||||||
public String selectMenuTree()
|
|
||||||
{
|
|
||||||
return prefix + "/tree";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 角色状态修改
|
|
||||||
*/
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:role:edit")
|
|
||||||
@PostMapping("/changeStatus")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult changeStatus(SysRole role)
|
|
||||||
{
|
|
||||||
roleService.checkRoleAllowed(role);
|
|
||||||
return toAjax(roleService.changeStatus(role));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 分配用户
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:edit")
|
|
||||||
@GetMapping("/authUser/{roleId}")
|
|
||||||
public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("role", roleService.selectRoleById(roleId));
|
|
||||||
return prefix + "/authUser";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询已分配用户角色列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:list")
|
|
||||||
@PostMapping("/authUser/allocatedList")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo allocatedList(SysUser user)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysUser> list = userService.selectAllocatedList(user);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 取消授权
|
|
||||||
*/
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
||||||
@PostMapping("/authUser/cancel")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult cancelAuthUser(SysUserRole userRole)
|
|
||||||
{
|
|
||||||
return toAjax(roleService.deleteAuthUser(userRole));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量取消授权
|
|
||||||
*/
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
||||||
@PostMapping("/authUser/cancelAll")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult cancelAuthUserAll(Long roleId, String userIds)
|
|
||||||
{
|
|
||||||
return toAjax(roleService.deleteAuthUsers(roleId, userIds));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/authUser/selectUser/{roleId}")
|
|
||||||
public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("role", roleService.selectRoleById(roleId));
|
|
||||||
return prefix + "/selectUser";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询未分配用户角色列表
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:role:list")
|
|
||||||
@PostMapping("/authUser/unallocatedList")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo unallocatedList(SysUser user)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysUser> list = userService.selectUnallocatedList(user);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量选择用户授权
|
|
||||||
*/
|
|
||||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
||||||
@PostMapping("/authUser/selectAll")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult selectAuthUserAll(Long roleId, String userIds)
|
|
||||||
{
|
|
||||||
return toAjax(roleService.insertAuthUsers(roleId, userIds));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,289 +0,0 @@
|
|||||||
package co.yixiang.web.controller.system;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import co.yixiang.system.service.ISysRoleService;
|
|
||||||
import co.yixiang.system.service.ISysUserService;
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.ModelMap;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
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.ResponseBody;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
import co.yixiang.common.annotation.Log;
|
|
||||||
import co.yixiang.common.constant.UserConstants;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysRole;
|
|
||||||
import co.yixiang.common.core.domain.entity.SysUser;
|
|
||||||
import co.yixiang.common.core.page.TableDataInfo;
|
|
||||||
import co.yixiang.common.enums.BusinessType;
|
|
||||||
import co.yixiang.common.utils.ShiroUtils;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import co.yixiang.common.utils.poi.ExcelUtil;
|
|
||||||
import co.yixiang.framework.shiro.service.SysPasswordService;
|
|
||||||
import co.yixiang.system.service.ISysPostService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 用户信息
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/system/user")
|
|
||||||
public class SysUserController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "system/user";
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserService userService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysRoleService roleService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysPostService postService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysPasswordService passwordService;
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String user()
|
|
||||||
{
|
|
||||||
return prefix + "/user";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:list")
|
|
||||||
@PostMapping("/list")
|
|
||||||
@ResponseBody
|
|
||||||
public TableDataInfo list(SysUser user)
|
|
||||||
{
|
|
||||||
startPage();
|
|
||||||
List<SysUser> list = userService.selectUserList(user);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
|
||||||
@RequiresPermissions("system:user:export")
|
|
||||||
@PostMapping("/export")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult export(SysUser user)
|
|
||||||
{
|
|
||||||
List<SysUser> list = userService.selectUserList(user);
|
|
||||||
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
||||||
return util.exportExcel(list, "用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
|
||||||
@RequiresPermissions("system:user:import")
|
|
||||||
@PostMapping("/importData")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
|
|
||||||
{
|
|
||||||
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
||||||
List<SysUser> userList = util.importExcel(file.getInputStream());
|
|
||||||
String operName = ShiroUtils.getSysUser().getLoginName();
|
|
||||||
String message = userService.importUser(userList, updateSupport, operName);
|
|
||||||
return AjaxResult.success(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:view")
|
|
||||||
@GetMapping("/importTemplate")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult importTemplate()
|
|
||||||
{
|
|
||||||
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
||||||
return util.importTemplateExcel("用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/add")
|
|
||||||
public String add(ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("roles", roleService.selectRoleAll().stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
|
||||||
mmap.put("posts", postService.selectPostAll());
|
|
||||||
return prefix + "/add";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增保存用户
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:user:add")
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/add")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult addSave(@Validated SysUser user)
|
|
||||||
{
|
|
||||||
if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName())))
|
|
||||||
{
|
|
||||||
return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在");
|
|
||||||
}
|
|
||||||
else if (StringUtils.isNotEmpty(user.getPhonenumber())
|
|
||||||
&& UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
||||||
{
|
|
||||||
return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
|
|
||||||
}
|
|
||||||
else if (StringUtils.isNotEmpty(user.getEmail())
|
|
||||||
&& UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
||||||
{
|
|
||||||
return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
|
|
||||||
}
|
|
||||||
user.setSalt(ShiroUtils.randomSalt());
|
|
||||||
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
|
|
||||||
user.setCreateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(userService.insertUser(user));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改用户
|
|
||||||
*/
|
|
||||||
@GetMapping("/edit/{userId}")
|
|
||||||
public String edit(@PathVariable("userId") Long userId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
|
||||||
mmap.put("user", userService.selectUserById(userId));
|
|
||||||
mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
|
||||||
mmap.put("posts", postService.selectPostsByUserId(userId));
|
|
||||||
return prefix + "/edit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改保存用户
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:user:edit")
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult editSave(@Validated SysUser user)
|
|
||||||
{
|
|
||||||
userService.checkUserAllowed(user);
|
|
||||||
if (StringUtils.isNotEmpty(user.getPhonenumber())
|
|
||||||
&& UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
||||||
{
|
|
||||||
return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
|
|
||||||
}
|
|
||||||
else if (StringUtils.isNotEmpty(user.getEmail())
|
|
||||||
&& UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
||||||
{
|
|
||||||
return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
|
|
||||||
}
|
|
||||||
user.setUpdateBy(ShiroUtils.getLoginName());
|
|
||||||
return toAjax(userService.updateUser(user));
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:resetPwd")
|
|
||||||
@GetMapping("/resetPwd/{userId}")
|
|
||||||
public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
mmap.put("user", userService.selectUserById(userId));
|
|
||||||
return prefix + "/resetPwd";
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:resetPwd")
|
|
||||||
@Log(title = "重置密码", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/resetPwd")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult resetPwdSave(SysUser user)
|
|
||||||
{
|
|
||||||
userService.checkUserAllowed(user);
|
|
||||||
user.setSalt(ShiroUtils.randomSalt());
|
|
||||||
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
|
|
||||||
if (userService.resetUserPwd(user) > 0)
|
|
||||||
{
|
|
||||||
if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue())
|
|
||||||
{
|
|
||||||
ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
|
|
||||||
}
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
return error();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 进入授权角色页
|
|
||||||
*/
|
|
||||||
@GetMapping("/authRole/{userId}")
|
|
||||||
public String authRole(@PathVariable("userId") Long userId, ModelMap mmap)
|
|
||||||
{
|
|
||||||
SysUser user = userService.selectUserById(userId);
|
|
||||||
// 获取用户所属的角色列表
|
|
||||||
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
|
||||||
mmap.put("user", user);
|
|
||||||
mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
|
||||||
return prefix + "/authRole";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 用户授权角色
|
|
||||||
*/
|
|
||||||
@RequiresPermissions("system:user:add")
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
|
||||||
@PostMapping("/authRole/insertAuthRole")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
|
|
||||||
{
|
|
||||||
userService.insertUserAuth(userId, roleIds);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermissions("system:user:remove")
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
||||||
@PostMapping("/remove")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult remove(String ids)
|
|
||||||
{
|
|
||||||
return toAjax(userService.deleteUserByIds(ids));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验用户名
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkLoginNameUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkLoginNameUnique(SysUser user)
|
|
||||||
{
|
|
||||||
return userService.checkLoginNameUnique(user.getLoginName());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验手机号码
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkPhoneUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkPhoneUnique(SysUser user)
|
|
||||||
{
|
|
||||||
return userService.checkPhoneUnique(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 校验email邮箱
|
|
||||||
*/
|
|
||||||
@PostMapping("/checkEmailUnique")
|
|
||||||
@ResponseBody
|
|
||||||
public String checkEmailUnique(SysUser user)
|
|
||||||
{
|
|
||||||
return userService.checkEmailUnique(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 用户状态修改
|
|
||||||
*/
|
|
||||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
||||||
@RequiresPermissions("system:user:edit")
|
|
||||||
@PostMapping("/changeStatus")
|
|
||||||
@ResponseBody
|
|
||||||
public AjaxResult changeStatus(SysUser user)
|
|
||||||
{
|
|
||||||
userService.checkUserAllowed(user);
|
|
||||||
return toAjax(userService.changeStatus(user));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package co.yixiang.web.controller.tool;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* build 表单构建
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/tool/build")
|
|
||||||
public class BuildController extends BaseController
|
|
||||||
{
|
|
||||||
private String prefix = "tool/build";
|
|
||||||
|
|
||||||
@RequiresPermissions("tool:build:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String build()
|
|
||||||
{
|
|
||||||
return prefix + "/build";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package co.yixiang.web.controller.tool;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* swagger 接口
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Controller
|
|
||||||
@RequestMapping("/tool/swagger")
|
|
||||||
public class SwaggerController extends BaseController
|
|
||||||
{
|
|
||||||
@RequiresPermissions("tool:swagger:view")
|
|
||||||
@GetMapping()
|
|
||||||
public String index()
|
|
||||||
{
|
|
||||||
return redirect("/swagger-ui.html");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,181 +0,0 @@
|
|||||||
package co.yixiang.web.controller.tool;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import co.yixiang.common.core.controller.BaseController;
|
|
||||||
import co.yixiang.common.core.domain.AjaxResult;
|
|
||||||
import co.yixiang.common.utils.StringUtils;
|
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* swagger 用户测试方法
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Api("用户信息管理")
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/test/user")
|
|
||||||
public class TestController extends BaseController
|
|
||||||
{
|
|
||||||
private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
|
|
||||||
{
|
|
||||||
users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
|
|
||||||
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiOperation("获取用户列表")
|
|
||||||
@GetMapping("/list")
|
|
||||||
public AjaxResult userList()
|
|
||||||
{
|
|
||||||
List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
|
|
||||||
return AjaxResult.success(userList);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiOperation("获取用户详细")
|
|
||||||
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
|
|
||||||
@GetMapping("/{userId}")
|
|
||||||
public AjaxResult getUser(@PathVariable Integer userId)
|
|
||||||
{
|
|
||||||
if (!users.isEmpty() && users.containsKey(userId))
|
|
||||||
{
|
|
||||||
return AjaxResult.success(users.get(userId));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return error("用户不存在");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiOperation("新增用户")
|
|
||||||
@ApiImplicitParams({
|
|
||||||
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer"),
|
|
||||||
@ApiImplicitParam(name = "username", value = "用户名称", dataType = "String"),
|
|
||||||
@ApiImplicitParam(name = "password", value = "用户密码", dataType = "String"),
|
|
||||||
@ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String")
|
|
||||||
})
|
|
||||||
@PostMapping("/save")
|
|
||||||
public AjaxResult save(UserEntity user)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
|
|
||||||
{
|
|
||||||
return error("用户ID不能为空");
|
|
||||||
}
|
|
||||||
return AjaxResult.success(users.put(user.getUserId(), user));
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiOperation("更新用户")
|
|
||||||
@PutMapping("/update")
|
|
||||||
public AjaxResult update(@RequestBody UserEntity user)
|
|
||||||
{
|
|
||||||
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
|
|
||||||
{
|
|
||||||
return error("用户ID不能为空");
|
|
||||||
}
|
|
||||||
if (users.isEmpty() || !users.containsKey(user.getUserId()))
|
|
||||||
{
|
|
||||||
return error("用户不存在");
|
|
||||||
}
|
|
||||||
users.remove(user.getUserId());
|
|
||||||
return AjaxResult.success(users.put(user.getUserId(), user));
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiOperation("删除用户信息")
|
|
||||||
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
|
|
||||||
@DeleteMapping("/{userId}")
|
|
||||||
public AjaxResult delete(@PathVariable Integer userId)
|
|
||||||
{
|
|
||||||
if (!users.isEmpty() && users.containsKey(userId))
|
|
||||||
{
|
|
||||||
users.remove(userId);
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return error("用户不存在");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ApiModel(value = "UserEntity", description = "用户实体")
|
|
||||||
class UserEntity
|
|
||||||
{
|
|
||||||
@ApiModelProperty("用户ID")
|
|
||||||
private Integer userId;
|
|
||||||
|
|
||||||
@ApiModelProperty("用户名称")
|
|
||||||
private String username;
|
|
||||||
|
|
||||||
@ApiModelProperty("用户密码")
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
@ApiModelProperty("用户手机")
|
|
||||||
private String mobile;
|
|
||||||
|
|
||||||
public UserEntity()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserEntity(Integer userId, String username, String password, String mobile)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
this.username = username;
|
|
||||||
this.password = password;
|
|
||||||
this.mobile = mobile;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getUserId()
|
|
||||||
{
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserId(Integer userId)
|
|
||||||
{
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername()
|
|
||||||
{
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username)
|
|
||||||
{
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword()
|
|
||||||
{
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password)
|
|
||||||
{
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getMobile()
|
|
||||||
{
|
|
||||||
return mobile;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMobile(String mobile)
|
|
||||||
{
|
|
||||||
this.mobile = mobile;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
package co.yixiang.web.core.config;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import co.yixiang.common.config.RuoYiConfig;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import springfox.documentation.builders.ApiInfoBuilder;
|
|
||||||
import springfox.documentation.builders.PathSelectors;
|
|
||||||
import springfox.documentation.builders.RequestHandlerSelectors;
|
|
||||||
import springfox.documentation.service.ApiInfo;
|
|
||||||
import springfox.documentation.service.Contact;
|
|
||||||
import springfox.documentation.spi.DocumentationType;
|
|
||||||
import springfox.documentation.spring.web.plugins.Docket;
|
|
||||||
import springfox.documentation.swagger2.annotations.EnableSwagger2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swagger2的接口配置
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
@EnableSwagger2
|
|
||||||
public class SwaggerConfig
|
|
||||||
{
|
|
||||||
/** 是否开启swagger */
|
|
||||||
@Value("${swagger.enabled}")
|
|
||||||
private boolean enabled;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 创建API
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Docket createRestApi()
|
|
||||||
{
|
|
||||||
return new Docket(DocumentationType.SWAGGER_2)
|
|
||||||
// 是否启用Swagger
|
|
||||||
.enable(enabled)
|
|
||||||
// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
|
|
||||||
.apiInfo(apiInfo())
|
|
||||||
// 设置哪些接口暴露给Swagger展示
|
|
||||||
.select()
|
|
||||||
// 扫描所有有注解的api，用这种方式更灵活
|
|
||||||
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
|
|
||||||
// 扫描指定包中的swagger注解
|
|
||||||
//.apis(RequestHandlerSelectors.basePackage("co.yixiang.project.tool.swagger"))
|
|
||||||
// 扫描所有 .apis(RequestHandlerSelectors.any())
|
|
||||||
.paths(PathSelectors.any())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 添加摘要信息
|
|
||||||
*/
|
|
||||||
private ApiInfo apiInfo()
|
|
||||||
{
|
|
||||||
// 用ApiInfoBuilder进行定制
|
|
||||||
return new ApiInfoBuilder()
|
|
||||||
// 设置标题
|
|
||||||
.title("标题：若依管理系统_接口文档")
|
|
||||||
// 描述
|
|
||||||
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
|
|
||||||
// 作者信息
|
|
||||||
.contact(new Contact(RuoYiConfig.getName(), null, null))
|
|
||||||
// 版本
|
|
||||||
.version("版本号:" + RuoYiConfig.getVersion())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
# 数据源配置
|
|
||||||
spring:
|
|
||||||
datasource:
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
driverClassName: com.mysql.cj.jdbc.Driver
|
|
||||||
druid:
|
|
||||||
# 主库数据源
|
|
||||||
master:
|
|
||||||
url: jdbc:mysql://localhost:3306/supply_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: root
|
|
||||||
# 从库数据源
|
|
||||||
slave:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: false
|
|
||||||
url:
|
|
||||||
username:
|
|
||||||
password:
|
|
||||||
# 初始连接数
|
|
||||||
initialSize: 5
|
|
||||||
# 最小连接池数量
|
|
||||||
minIdle: 10
|
|
||||||
# 最大连接池数量
|
|
||||||
maxActive: 20
|
|
||||||
# 配置获取连接等待超时的时间
|
|
||||||
maxWait: 60000
|
|
||||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
|
||||||
timeBetweenEvictionRunsMillis: 60000
|
|
||||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
|
||||||
minEvictableIdleTimeMillis: 300000
|
|
||||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
|
||||||
maxEvictableIdleTimeMillis: 900000
|
|
||||||
# 配置检测连接是否有效
|
|
||||||
validationQuery: SELECT 1 FROM DUAL
|
|
||||||
testWhileIdle: true
|
|
||||||
testOnBorrow: false
|
|
||||||
testOnReturn: false
|
|
||||||
webStatFilter:
|
|
||||||
enabled: true
|
|
||||||
statViewServlet:
|
|
||||||
enabled: true
|
|
||||||
# 设置白名单，不填则允许所有访问
|
|
||||||
allow:
|
|
||||||
url-pattern: /druid/*
|
|
||||||
# 控制台管理用户名和密码
|
|
||||||
login-username: ruoyi
|
|
||||||
login-password: 123456
|
|
||||||
filter:
|
|
||||||
stat:
|
|
||||||
enabled: true
|
|
||||||
# 慢SQL记录
|
|
||||||
log-slow-sql: true
|
|
||||||
slow-sql-millis: 1000
|
|
||||||
merge-sql: true
|
|
||||||
wall:
|
|
||||||
config:
|
|
||||||
multi-statement-allow: true
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
# 项目相关配置
|
|
||||||
ruoyi:
|
|
||||||
# 名称
|
|
||||||
name: supplier
|
|
||||||
# 版本
|
|
||||||
version: 2.0.0
|
|
||||||
# 版权年份
|
|
||||||
copyrightYear: 2021
|
|
||||||
# 实例演示开关
|
|
||||||
demoEnabled: true
|
|
||||||
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
|
|
||||||
profile: D:/ruoyi/uploadPath
|
|
||||||
# 获取ip地址开关
|
|
||||||
addressEnabled: false
|
|
||||||
|
|
||||||
# 开发环境配置
|
|
||||||
server:
|
|
||||||
# 服务器的HTTP端口，默认为80
|
|
||||||
port: 8080
|
|
||||||
servlet:
|
|
||||||
# 应用的访问路径
|
|
||||||
context-path: /
|
|
||||||
tomcat:
|
|
||||||
# tomcat的URI编码
|
|
||||||
uri-encoding: UTF-8
|
|
||||||
# tomcat最大线程数，默认为200
|
|
||||||
max-threads: 800
|
|
||||||
# Tomcat启动初始化的线程数，默认值25
|
|
||||||
min-spare-threads: 30
|
|
||||||
|
|
||||||
# 日志配置
|
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
co.yixiang: debug
|
|
||||||
org.springframework: warn
|
|
||||||
|
|
||||||
# 用户配置
|
|
||||||
user:
|
|
||||||
password:
|
|
||||||
# 密码错误{maxRetryCount}次锁定10分钟
|
|
||||||
maxRetryCount: 5
|
|
||||||
|
|
||||||
# Spring配置
|
|
||||||
spring:
|
|
||||||
# 模板引擎
|
|
||||||
thymeleaf:
|
|
||||||
mode: HTML
|
|
||||||
encoding: utf-8
|
|
||||||
# 禁用缓存
|
|
||||||
cache: false
|
|
||||||
# 资源信息
|
|
||||||
messages:
|
|
||||||
# 国际化资源文件路径
|
|
||||||
basename: static/i18n/messages
|
|
||||||
jackson:
|
|
||||||
time-zone: GMT+8
|
|
||||||
date-format: yyyy-MM-dd HH:mm:ss
|
|
||||||
profiles:
|
|
||||||
active: druid
|
|
||||||
# 文件上传
|
|
||||||
servlet:
|
|
||||||
multipart:
|
|
||||||
# 单个文件大小
|
|
||||||
max-file-size: 10MB
|
|
||||||
# 设置总上传的文件大小
|
|
||||||
max-request-size: 20MB
|
|
||||||
# 服务模块
|
|
||||||
devtools:
|
|
||||||
restart:
|
|
||||||
# 热部署开关
|
|
||||||
enabled: true
|
|
||||||
|
|
||||||
# MyBatis
|
|
||||||
mybatis:
|
|
||||||
# 搜索指定包别名
|
|
||||||
typeAliasesPackage: co.yixiang.**.domain
|
|
||||||
# 配置mapper的扫描，找到所有的mapper.xml映射文件
|
|
||||||
mapperLocations: classpath*:mapper/**/*Mapper.xml
|
|
||||||
# 加载全局的配置文件
|
|
||||||
configLocation: classpath:mybatis/mybatis-config.xml
|
|
||||||
|
|
||||||
# PageHelper分页插件
|
|
||||||
pagehelper:
|
|
||||||
helperDialect: mysql
|
|
||||||
reasonable: true
|
|
||||||
supportMethodsArguments: true
|
|
||||||
params: count=countSql
|
|
||||||
|
|
||||||
# Shiro
|
|
||||||
shiro:
|
|
||||||
user:
|
|
||||||
# 登录地址
|
|
||||||
loginUrl: /login
|
|
||||||
# 权限认证失败地址
|
|
||||||
unauthorizedUrl: /unauth
|
|
||||||
# 首页地址
|
|
||||||
indexUrl: /index
|
|
||||||
# 验证码开关
|
|
||||||
captchaEnabled: true
|
|
||||||
# 验证码类型 math 数组计算 char 字符
|
|
||||||
captchaType: math
|
|
||||||
cookie:
|
|
||||||
# 设置Cookie的域名 默认空，即当前访问的域名
|
|
||||||
domain:
|
|
||||||
# 设置cookie的有效访问路径
|
|
||||||
path: /
|
|
||||||
# 设置HttpOnly属性
|
|
||||||
httpOnly: true
|
|
||||||
# 设置Cookie的过期时间，天为单位
|
|
||||||
maxAge: 30
|
|
||||||
session:
|
|
||||||
# Session超时时间，-1代表永不过期（默认30分钟）
|
|
||||||
expireTime: 30
|
|
||||||
# 同步session到数据库的周期（默认1分钟）
|
|
||||||
dbSyncPeriod: 1
|
|
||||||
# 相隔多久检查一次session的有效性，默认就是10分钟
|
|
||||||
validationInterval: 10
|
|
||||||
# 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
|
|
||||||
maxSession: -1
|
|
||||||
# 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
|
|
||||||
kickoutAfter: false
|
|
||||||
|
|
||||||
# 防止XSS攻击
|
|
||||||
xss:
|
|
||||||
# 过滤开关
|
|
||||||
enabled: true
|
|
||||||
# 排除链接（多个用逗号分隔）
|
|
||||||
excludes: /system/notice/*
|
|
||||||
# 匹配链接
|
|
||||||
urlPatterns: /system/*,/monitor/*,/tool/*
|
|
||||||
|
|
||||||
# Swagger配置
|
|
||||||
swagger:
|
|
||||||
# 是否开启swagger
|
|
||||||
enabled: true
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
Application Version: ${ruoyi.version}
|
|
||||||
Spring Boot Version: ${spring-boot.version}
|
|
||||||
////////////////////////////////////////////////////////////////////
|
|
||||||
// _ooOoo_ //
|
|
||||||
// o8888888o //
|
|
||||||
// 88" . "88 //
|
|
||||||
// (| ^_^ |) //
|
|
||||||
// O\ = /O //
|
|
||||||
// ____/`---'\____ //
|
|
||||||
// .' \\| |// `. //
|
|
||||||
// / \\||| : |||// \ //
|
|
||||||
// / _||||| -:- |||||- \ //
|
|
||||||
// | | \\\ - /// | | //
|
|
||||||
// | \_| ''\---/'' | | //
|
|
||||||
// \ .-\__ `-` ___/-. / //
|
|
||||||
// ___`. .' /--.--\ `. . ___ //
|
|
||||||
// ."" '< `.___\_<|>_/___.' >'"". //
|
|
||||||
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
|
|
||||||
// \ \ `-. \_ __\ /__ _/ .-` / / //
|
|
||||||
// ========`-.____`-.___\_____/___.-`____.-'======== //
|
|
||||||
// `=---=' //
|
|
||||||
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
|
|
||||||
// 佛祖保佑 永不宕机 永无BUG //
|
|
||||||
////////////////////////////////////////////////////////////////////
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ehcache name="ruoyi" updateCheck="false">
|
|
||||||
|
|
||||||
<!-- 磁盘缓存位置 -->
|
|
||||||
<diskStore path="java.io.tmpdir"/>
|
|
||||||
|
|
||||||
<!-- maxEntriesLocalHeap:堆内存中最大缓存对象数，0没有限制 -->
|
|
||||||
<!-- maxElementsInMemory： 在内存中缓存的element的最大数目。-->
|
|
||||||
<!-- eternal:elements是否永久有效，如果为true，timeouts将被忽略，element将永不过期 -->
|
|
||||||
<!-- timeToIdleSeconds:失效前的空闲秒数，当eternal为false时，这个属性才有效，0为不限制 -->
|
|
||||||
<!-- timeToLiveSeconds:失效前的存活秒数，创建时间到失效时间的间隔为存活时间，当eternal为false时，这个属性才有效，0为不限制 -->
|
|
||||||
<!-- overflowToDisk： 如果内存中数据超过内存限制，是否要缓存到磁盘上 -->
|
|
||||||
<!-- statistics：是否收集统计信息。如果需要监控缓存使用情况，应该打开这个选项。默认为关闭（统计会影响性能）。设置statistics="true"开启统计 -->
|
|
||||||
|
|
||||||
<!-- 默认缓存 -->
|
|
||||||
<defaultCache
|
|
||||||
maxEntriesLocalHeap="1000"
|
|
||||||
eternal="false"
|
|
||||||
timeToIdleSeconds="3600"
|
|
||||||
timeToLiveSeconds="3600"
|
|
||||||
overflowToDisk="false">
|
|
||||||
</defaultCache>
|
|
||||||
|
|
||||||
<!-- 登录记录缓存 锁定10分钟 -->
|
|
||||||
<cache name="loginRecordCache"
|
|
||||||
maxEntriesLocalHeap="2000"
|
|
||||||
eternal="false"
|
|
||||||
timeToIdleSeconds="600"
|
|
||||||
timeToLiveSeconds="0"
|
|
||||||
overflowToDisk="false"
|
|
||||||
statistics="false">
|
|
||||||
</cache>
|
|
||||||
|
|
||||||
<!-- 系统活跃用户缓存 -->
|
|
||||||
<cache name="sys-userCache"
|
|
||||||
maxEntriesLocalHeap="10000"
|
|
||||||
overflowToDisk="false"
|
|
||||||
eternal="false"
|
|
||||||
diskPersistent="false"
|
|
||||||
timeToLiveSeconds="0"
|
|
||||||
timeToIdleSeconds="0"
|
|
||||||
statistics="false">
|
|
||||||
</cache>
|
|
||||||
|
|
||||||
<!-- 系统用户授权缓存 没必要过期 -->
|
|
||||||
<cache name="sys-authCache"
|
|
||||||
maxEntriesLocalHeap="10000"
|
|
||||||
overflowToDisk="false"
|
|
||||||
eternal="false"
|
|
||||||
diskPersistent="false"
|
|
||||||
timeToLiveSeconds="0"
|
|
||||||
timeToIdleSeconds="0"
|
|
||||||
memoryStoreEvictionPolicy="LRU"
|
|
||||||
statistics="false"/>
|
|
||||||
|
|
||||||
<!-- 系统缓存 -->
|
|
||||||
<cache name="sys-cache"
|
|
||||||
maxEntriesLocalHeap="1000"
|
|
||||||
eternal="true"
|
|
||||||
overflowToDisk="true"
|
|
||||||
statistics="false">
|
|
||||||
</cache>
|
|
||||||
|
|
||||||
<!-- 系统参数缓存 -->
|
|
||||||
<cache name="sys-config"
|
|
||||||
maxEntriesLocalHeap="1000"
|
|
||||||
eternal="true"
|
|
||||||
overflowToDisk="true"
|
|
||||||
statistics="false">
|
|
||||||
</cache>
|
|
||||||
|
|
||||||
<!-- 系统字典缓存 -->
|
|
||||||
<cache name="sys-dict"
|
|
||||||
maxEntriesLocalHeap="1000"
|
|
||||||
eternal="true"
|
|
||||||
overflowToDisk="true"
|
|
||||||
statistics="false">
|
|
||||||
</cache>
|
|
||||||
|
|
||||||
<!-- 系统会话缓存 -->
|
|
||||||
<cache name="shiro-activeSessionCache"
|
|
||||||
maxEntriesLocalHeap="10000"
|
|
||||||
overflowToDisk="false"
|
|
||||||
eternal="false"
|
|
||||||
diskPersistent="false"
|
|
||||||
timeToLiveSeconds="0"
|
|
||||||
timeToIdleSeconds="0"
|
|
||||||
statistics="false"/>
|
|
||||||
|
|
||||||
</ehcache>
|
|
||||||
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration>
|
|
||||||
<!-- 日志存放路径 -->
|
|
||||||
<property name="log.path" value="/home/ruoyi/logs" />
|
|
||||||
<!-- 日志输出格式 -->
|
|
||||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统日志输出 -->
|
|
||||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-info.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>INFO</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-error.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>ERROR</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 用户访问日志输出 -->
|
|
||||||
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-user.log</file>
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 按天回滚 daily -->
|
|
||||||
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
|
||||||
<logger name="co.yixiang" level="info" />
|
|
||||||
<!-- Spring日志级别控制 -->
|
|
||||||
<logger name="org.springframework" level="warn" />
|
|
||||||
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="console" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统操作日志-->
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="file_info" />
|
|
||||||
<appender-ref ref="file_error" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统用户操作日志-->
|
|
||||||
<logger name="sys-user" level="info">
|
|
||||||
<appender-ref ref="sys-user"/>
|
|
||||||
</logger>
|
|
||||||
</configuration>
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<!DOCTYPE configuration
|
|
||||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
|
||||||
<configuration>
|
|
||||||
|
|
||||||
<settings>
|
|
||||||
<setting name="cacheEnabled" value="true" /> <!-- 全局映射器启用缓存 -->
|
|
||||||
<setting name="useGeneratedKeys" value="true" /> <!-- 允许 JDBC 支持自动生成主键 -->
|
|
||||||
<setting name="defaultExecutorType" value="REUSE" /> <!-- 配置默认的执行器 -->
|
|
||||||
<setting name="logImpl" value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
|
|
||||||
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> 驼峰式命名 -->
|
|
||||||
</settings>
|
|
||||||
|
|
||||||
</configuration>
|
|
||||||
@@ -1,617 +0,0 @@
|
|||||||
/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
|
|
||||||
/*
|
|
||||||
|
|
||||||
The MIT License (MIT)
|
|
||||||
|
|
||||||
Copyright (c) 2007-2013 Einar Lielmanis and contributors.
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person
|
|
||||||
obtaining a copy of this software and associated documentation files
|
|
||||||
(the "Software"), to deal in the Software without restriction,
|
|
||||||
including without limitation the rights to use, copy, modify, merge,
|
|
||||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
|
||||||
and to permit persons to whom the Software is furnished to do so,
|
|
||||||
subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
|
|
||||||
Style HTML
|
|
||||||
---------------
|
|
||||||
|
|
||||||
Written by Nochum Sossonko, (nsossonko@hotmail.com)
|
|
||||||
|
|
||||||
Based on code initially developed by: Einar Lielmanis, <elfz@laacz.lv>
|
|
||||||
http://jsbeautifier.org/
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
style_html(html_source);
|
|
||||||
|
|
||||||
style_html(html_source, options);
|
|
||||||
|
|
||||||
The options are:
|
|
||||||
indent_size (default 4) — indentation size,
|
|
||||||
indent_char (default space) — character to indent with,
|
|
||||||
max_char (default 250) - maximum amount of characters per line (0 = disable)
|
|
||||||
brace_style (default "collapse") - "collapse" | "expand" | "end-expand"
|
|
||||||
put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
|
|
||||||
unformatted (defaults to inline tags) - list of tags, that shouldn't be reformatted
|
|
||||||
indent_scripts (default normal) - "keep"|"separate"|"normal"
|
|
||||||
|
|
||||||
e.g.
|
|
||||||
|
|
||||||
style_html(html_source, {
|
|
||||||
'indent_size': 2,
|
|
||||||
'indent_char': ' ',
|
|
||||||
'max_char': 78,
|
|
||||||
'brace_style': 'expand',
|
|
||||||
'unformatted': ['a', 'sub', 'sup', 'b', 'i', 'u']
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
|
|
||||||
function style_html(html_source, options, js_beautify, css_beautify) {
|
|
||||||
//Wrapper function to invoke all the necessary constructors and deal with the output.
|
|
||||||
|
|
||||||
var multi_parser,
|
|
||||||
indent_size,
|
|
||||||
indent_character,
|
|
||||||
max_char,
|
|
||||||
brace_style,
|
|
||||||
unformatted;
|
|
||||||
|
|
||||||
options = options || {};
|
|
||||||
indent_size = options.indent_size || 4;
|
|
||||||
indent_character = options.indent_char || ' ';
|
|
||||||
brace_style = options.brace_style || 'collapse';
|
|
||||||
max_char = options.max_char === 0 ? Infinity : options.max_char || 250;
|
|
||||||
unformatted = options.unformatted || ['a', 'span', 'bdo', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'sub', 'sup', 'tt', 'i', 'b', 'big', 'small', 'u', 's', 'strike', 'font', 'ins', 'del', 'pre', 'address', 'dt', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
|
|
||||||
|
|
||||||
function Parser() {
|
|
||||||
|
|
||||||
this.pos = 0; //Parser position
|
|
||||||
this.token = '';
|
|
||||||
this.current_mode = 'CONTENT'; //reflects the current Parser mode: TAG/CONTENT
|
|
||||||
this.tags = { //An object to hold tags, their position, and their parent-tags, initiated with default values
|
|
||||||
parent: 'parent1',
|
|
||||||
parentcount: 1,
|
|
||||||
parent1: ''
|
|
||||||
};
|
|
||||||
this.tag_type = '';
|
|
||||||
this.token_text = this.last_token = this.last_text = this.token_type = '';
|
|
||||||
|
|
||||||
this.Utils = { //Uilities made available to the various functions
|
|
||||||
whitespace: "\n\r\t ".split(''),
|
|
||||||
single_token: 'br,input,link,meta,!doctype,basefont,base,area,hr,wbr,param,img,isindex,?xml,embed,?php,?,?='.split(','), //all the single tags for HTML
|
|
||||||
extra_liners: 'head,body,/html'.split(','), //for tags that need a line of whitespace before them
|
|
||||||
in_array: function (what, arr) {
|
|
||||||
for (var i=0; i<arr.length; i++) {
|
|
||||||
if (what === arr[i]) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_content = function () { //function to capture regular content between tags
|
|
||||||
|
|
||||||
var input_char = '',
|
|
||||||
content = [],
|
|
||||||
space = false; //if a space is needed
|
|
||||||
|
|
||||||
while (this.input.charAt(this.pos) !== '<') {
|
|
||||||
if (this.pos >= this.input.length) {
|
|
||||||
return content.length?content.join(''):['', 'TK_EOF'];
|
|
||||||
}
|
|
||||||
|
|
||||||
input_char = this.input.charAt(this.pos);
|
|
||||||
this.pos++;
|
|
||||||
this.line_char_count++;
|
|
||||||
|
|
||||||
if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
|
|
||||||
if (content.length) {
|
|
||||||
space = true;
|
|
||||||
}
|
|
||||||
this.line_char_count--;
|
|
||||||
continue; //don't want to insert unnecessary space
|
|
||||||
}
|
|
||||||
else if (space) {
|
|
||||||
if (this.line_char_count >= this.max_char) { //insert a line when the max_char is reached
|
|
||||||
content.push('\n');
|
|
||||||
for (var i=0; i<this.indent_level; i++) {
|
|
||||||
content.push(this.indent_string);
|
|
||||||
}
|
|
||||||
this.line_char_count = 0;
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
content.push(' ');
|
|
||||||
this.line_char_count++;
|
|
||||||
}
|
|
||||||
space = false;
|
|
||||||
}
|
|
||||||
content.push(input_char); //letter at-a-time (or string) inserted to an array
|
|
||||||
}
|
|
||||||
return content.length?content.join(''):'';
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_contents_to = function (name) { //get the full content of a script or style to pass to js_beautify
|
|
||||||
if (this.pos === this.input.length) {
|
|
||||||
return ['', 'TK_EOF'];
|
|
||||||
}
|
|
||||||
var input_char = '';
|
|
||||||
var content = '';
|
|
||||||
var reg_match = new RegExp('</' + name + '\\s*>', 'igm');
|
|
||||||
reg_match.lastIndex = this.pos;
|
|
||||||
var reg_array = reg_match.exec(this.input);
|
|
||||||
var end_script = reg_array?reg_array.index:this.input.length; //absolute end of script
|
|
||||||
if(this.pos < end_script) { //get everything in between the script tags
|
|
||||||
content = this.input.substring(this.pos, end_script);
|
|
||||||
this.pos = end_script;
|
|
||||||
}
|
|
||||||
return content;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.record_tag = function (tag){ //function to record a tag and its parent in this.tags Object
|
|
||||||
if (this.tags[tag + 'count']) { //check for the existence of this tag type
|
|
||||||
this.tags[tag + 'count']++;
|
|
||||||
this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
|
|
||||||
}
|
|
||||||
else { //otherwise initialize this tag type
|
|
||||||
this.tags[tag + 'count'] = 1;
|
|
||||||
this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
|
|
||||||
}
|
|
||||||
this.tags[tag + this.tags[tag + 'count'] + 'parent'] = this.tags.parent; //set the parent (i.e. in the case of a div this.tags.div1parent)
|
|
||||||
this.tags.parent = tag + this.tags[tag + 'count']; //and make this the current parent (i.e. in the case of a div 'div1')
|
|
||||||
};
|
|
||||||
|
|
||||||
this.retrieve_tag = function (tag) { //function to retrieve the opening tag to the corresponding closer
|
|
||||||
if (this.tags[tag + 'count']) { //if the openener is not in the Object we ignore it
|
|
||||||
var temp_parent = this.tags.parent; //check to see if it's a closable tag.
|
|
||||||
while (temp_parent) { //till we reach '' (the initial value);
|
|
||||||
if (tag + this.tags[tag + 'count'] === temp_parent) { //if this is it use it
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
temp_parent = this.tags[temp_parent + 'parent']; //otherwise keep on climbing up the DOM Tree
|
|
||||||
}
|
|
||||||
if (temp_parent) { //if we caught something
|
|
||||||
this.indent_level = this.tags[tag + this.tags[tag + 'count']]; //set the indent_level accordingly
|
|
||||||
this.tags.parent = this.tags[temp_parent + 'parent']; //and set the current parent
|
|
||||||
}
|
|
||||||
delete this.tags[tag + this.tags[tag + 'count'] + 'parent']; //delete the closed tags parent reference...
|
|
||||||
delete this.tags[tag + this.tags[tag + 'count']]; //...and the tag itself
|
|
||||||
if (this.tags[tag + 'count'] === 1) {
|
|
||||||
delete this.tags[tag + 'count'];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.tags[tag + 'count']--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_tag = function (peek) { //function to get a full tag and parse its type
|
|
||||||
var input_char = '',
|
|
||||||
content = [],
|
|
||||||
comment = '',
|
|
||||||
space = false,
|
|
||||||
tag_start, tag_end,
|
|
||||||
orig_pos = this.pos,
|
|
||||||
orig_line_char_count = this.line_char_count;
|
|
||||||
|
|
||||||
peek = peek !== undefined ? peek : false;
|
|
||||||
|
|
||||||
do {
|
|
||||||
if (this.pos >= this.input.length) {
|
|
||||||
if (peek) {
|
|
||||||
this.pos = orig_pos;
|
|
||||||
this.line_char_count = orig_line_char_count;
|
|
||||||
}
|
|
||||||
return content.length?content.join(''):['', 'TK_EOF'];
|
|
||||||
}
|
|
||||||
|
|
||||||
input_char = this.input.charAt(this.pos);
|
|
||||||
this.pos++;
|
|
||||||
this.line_char_count++;
|
|
||||||
|
|
||||||
if (this.Utils.in_array(input_char, this.Utils.whitespace)) { //don't want to insert unnecessary space
|
|
||||||
space = true;
|
|
||||||
this.line_char_count--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (input_char === "'" || input_char === '"') {
|
|
||||||
if (!content[1] || content[1] !== '!') { //if we're in a comment strings don't get treated specially
|
|
||||||
input_char += this.get_unformatted(input_char);
|
|
||||||
space = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (input_char === '=') { //no space before =
|
|
||||||
space = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (content.length && content[content.length-1] !== '=' && input_char !== '>' && space) {
|
|
||||||
//no space after = or before >
|
|
||||||
if (this.line_char_count >= this.max_char) {
|
|
||||||
this.print_newline(false, content);
|
|
||||||
this.line_char_count = 0;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
content.push(' ');
|
|
||||||
this.line_char_count++;
|
|
||||||
}
|
|
||||||
space = false;
|
|
||||||
}
|
|
||||||
if (input_char === '<') {
|
|
||||||
tag_start = this.pos - 1;
|
|
||||||
}
|
|
||||||
content.push(input_char); //inserts character at-a-time (or string)
|
|
||||||
} while (input_char !== '>');
|
|
||||||
|
|
||||||
var tag_complete = content.join('');
|
|
||||||
var tag_index;
|
|
||||||
if (tag_complete.indexOf(' ') !== -1) { //if there's whitespace, thats where the tag name ends
|
|
||||||
tag_index = tag_complete.indexOf(' ');
|
|
||||||
}
|
|
||||||
else { //otherwise go with the tag ending
|
|
||||||
tag_index = tag_complete.indexOf('>');
|
|
||||||
}
|
|
||||||
var tag_check = tag_complete.substring(1, tag_index).toLowerCase();
|
|
||||||
if (tag_complete.charAt(tag_complete.length-2) === '/' ||
|
|
||||||
this.Utils.in_array(tag_check, this.Utils.single_token)) { //if this tag name is a single tag type (either in the list or has a closing /)
|
|
||||||
if ( ! peek) {
|
|
||||||
this.tag_type = 'SINGLE';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (tag_check === 'script') { //for later script handling
|
|
||||||
if ( ! peek) {
|
|
||||||
this.record_tag(tag_check);
|
|
||||||
this.tag_type = 'SCRIPT';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (tag_check === 'style') { //for future style handling (for now it justs uses get_content)
|
|
||||||
if ( ! peek) {
|
|
||||||
this.record_tag(tag_check);
|
|
||||||
this.tag_type = 'STYLE';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (this.is_unformatted(tag_check, unformatted)) { // do not reformat the "unformatted" tags
|
|
||||||
comment = this.get_unformatted('</'+tag_check+'>', tag_complete); //...delegate to get_unformatted function
|
|
||||||
content.push(comment);
|
|
||||||
// Preserve collapsed whitespace either before or after this tag.
|
|
||||||
if (tag_start > 0 && this.Utils.in_array(this.input.charAt(tag_start - 1), this.Utils.whitespace)){
|
|
||||||
content.splice(0, 0, this.input.charAt(tag_start - 1));
|
|
||||||
}
|
|
||||||
tag_end = this.pos - 1;
|
|
||||||
if (this.Utils.in_array(this.input.charAt(tag_end + 1), this.Utils.whitespace)){
|
|
||||||
content.push(this.input.charAt(tag_end + 1));
|
|
||||||
}
|
|
||||||
this.tag_type = 'SINGLE';
|
|
||||||
}
|
|
||||||
else if (tag_check.charAt(0) === '!') { //peek for <!-- comment
|
|
||||||
if (tag_check.indexOf('[if') !== -1) { //peek for <!--[if conditional comment
|
|
||||||
if (tag_complete.indexOf('!IE') !== -1) { //this type needs a closing --> so...
|
|
||||||
comment = this.get_unformatted('-->', tag_complete); //...delegate to get_unformatted
|
|
||||||
content.push(comment);
|
|
||||||
}
|
|
||||||
if ( ! peek) {
|
|
||||||
this.tag_type = 'START';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (tag_check.indexOf('[endif') !== -1) {//peek for <!--[endif end conditional comment
|
|
||||||
this.tag_type = 'END';
|
|
||||||
this.unindent();
|
|
||||||
}
|
|
||||||
else if (tag_check.indexOf('[cdata[') !== -1) { //if it's a <[cdata[ comment...
|
|
||||||
comment = this.get_unformatted(']]>', tag_complete); //...delegate to get_unformatted function
|
|
||||||
content.push(comment);
|
|
||||||
if ( ! peek) {
|
|
||||||
this.tag_type = 'SINGLE'; //<![CDATA[ comments are treated like single tags
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
comment = this.get_unformatted('-->', tag_complete);
|
|
||||||
content.push(comment);
|
|
||||||
this.tag_type = 'SINGLE';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ( ! peek) {
|
|
||||||
if (tag_check.charAt(0) === '/') { //this tag is a double tag so check for tag-ending
|
|
||||||
this.retrieve_tag(tag_check.substring(1)); //remove it and all ancestors
|
|
||||||
this.tag_type = 'END';
|
|
||||||
}
|
|
||||||
else { //otherwise it's a start-tag
|
|
||||||
this.record_tag(tag_check); //push it on the tag stack
|
|
||||||
this.tag_type = 'START';
|
|
||||||
}
|
|
||||||
if (this.Utils.in_array(tag_check, this.Utils.extra_liners)) { //check if this double needs an extra line
|
|
||||||
this.print_newline(true, this.output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (peek) {
|
|
||||||
this.pos = orig_pos;
|
|
||||||
this.line_char_count = orig_line_char_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
return content.join(''); //returns fully formatted tag
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_unformatted = function (delimiter, orig_tag) { //function to return unformatted content in its entirety
|
|
||||||
|
|
||||||
if (orig_tag && orig_tag.toLowerCase().indexOf(delimiter) !== -1) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
var input_char = '';
|
|
||||||
var content = '';
|
|
||||||
var space = true;
|
|
||||||
do {
|
|
||||||
|
|
||||||
if (this.pos >= this.input.length) {
|
|
||||||
return content;
|
|
||||||
}
|
|
||||||
|
|
||||||
input_char = this.input.charAt(this.pos);
|
|
||||||
this.pos++;
|
|
||||||
|
|
||||||
if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
|
|
||||||
if (!space) {
|
|
||||||
this.line_char_count--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (input_char === '\n' || input_char === '\r') {
|
|
||||||
content += '\n';
|
|
||||||
/* Don't change tab indention for unformatted blocks. If using code for html editing, this will greatly affect <pre> tags if they are specified in the 'unformatted array'
|
|
||||||
for (var i=0; i<this.indent_level; i++) {
|
|
||||||
content += this.indent_string;
|
|
||||||
}
|
|
||||||
space = false; //...and make sure other indentation is erased
|
|
||||||
*/
|
|
||||||
this.line_char_count = 0;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
content += input_char;
|
|
||||||
this.line_char_count++;
|
|
||||||
space = true;
|
|
||||||
|
|
||||||
|
|
||||||
} while (content.toLowerCase().indexOf(delimiter) === -1);
|
|
||||||
return content;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_token = function () { //initial handler for token-retrieval
|
|
||||||
var token;
|
|
||||||
|
|
||||||
if (this.last_token === 'TK_TAG_SCRIPT' || this.last_token === 'TK_TAG_STYLE') { //check if we need to format javascript
|
|
||||||
var type = this.last_token.substr(7);
|
|
||||||
token = this.get_contents_to(type);
|
|
||||||
if (typeof token !== 'string') {
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
return [token, 'TK_' + type];
|
|
||||||
}
|
|
||||||
if (this.current_mode === 'CONTENT') {
|
|
||||||
token = this.get_content();
|
|
||||||
if (typeof token !== 'string') {
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return [token, 'TK_CONTENT'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.current_mode === 'TAG') {
|
|
||||||
token = this.get_tag();
|
|
||||||
if (typeof token !== 'string') {
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
var tag_name_type = 'TK_TAG_' + this.tag_type;
|
|
||||||
return [token, tag_name_type];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.get_full_indent = function (level) {
|
|
||||||
level = this.indent_level + level || 0;
|
|
||||||
if (level < 1) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
return Array(level + 1).join(this.indent_string);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.is_unformatted = function(tag_check, unformatted) {
|
|
||||||
//is this an HTML5 block-level link?
|
|
||||||
if (!this.Utils.in_array(tag_check, unformatted)){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tag_check.toLowerCase() !== 'a' || !this.Utils.in_array('a', unformatted)){
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//at this point we have an tag; is its first child something we want to remain
|
|
||||||
//unformatted?
|
|
||||||
var next_tag = this.get_tag(true /* peek. */);
|
|
||||||
|
|
||||||
// tets next_tag to see if it is just html tag (no external content)
|
|
||||||
var tag = (next_tag || "").match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);
|
|
||||||
|
|
||||||
// if next_tag comes back but is not an isolated tag, then
|
|
||||||
// let's treat the 'a' tag as having content
|
|
||||||
// and respect the unformatted option
|
|
||||||
if (!tag || this.Utils.in_array(tag, unformatted)){
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.printer = function (js_source, indent_character, indent_size, max_char, brace_style) { //handles input/output and some other printing functions
|
|
||||||
|
|
||||||
this.input = js_source || ''; //gets the input for the Parser
|
|
||||||
this.output = [];
|
|
||||||
this.indent_character = indent_character;
|
|
||||||
this.indent_string = '';
|
|
||||||
this.indent_size = indent_size;
|
|
||||||
this.brace_style = brace_style;
|
|
||||||
this.indent_level = 0;
|
|
||||||
this.max_char = max_char;
|
|
||||||
this.line_char_count = 0; //count to see if max_char was exceeded
|
|
||||||
|
|
||||||
for (var i=0; i<this.indent_size; i++) {
|
|
||||||
this.indent_string += this.indent_character;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.print_newline = function (ignore, arr) {
|
|
||||||
this.line_char_count = 0;
|
|
||||||
if (!arr || !arr.length) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!ignore) { //we might want the extra line
|
|
||||||
while (this.Utils.in_array(arr[arr.length-1], this.Utils.whitespace)) {
|
|
||||||
arr.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
arr.push('\n');
|
|
||||||
for (var i=0; i<this.indent_level; i++) {
|
|
||||||
arr.push(this.indent_string);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.print_token = function (text) {
|
|
||||||
this.output.push(text);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.indent = function () {
|
|
||||||
this.indent_level++;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.unindent = function () {
|
|
||||||
if (this.indent_level > 0) {
|
|
||||||
this.indent_level--;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*_____________________--------------------_____________________*/
|
|
||||||
|
|
||||||
multi_parser = new Parser(); //wrapping functions Parser
|
|
||||||
multi_parser.printer(html_source, indent_character, indent_size, max_char, brace_style); //initialize starting values
|
|
||||||
|
|
||||||
while (true) {
|
|
||||||
var t = multi_parser.get_token();
|
|
||||||
multi_parser.token_text = t[0];
|
|
||||||
multi_parser.token_type = t[1];
|
|
||||||
|
|
||||||
if (multi_parser.token_type === 'TK_EOF') {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (multi_parser.token_type) {
|
|
||||||
case 'TK_TAG_START':
|
|
||||||
multi_parser.print_newline(false, multi_parser.output);
|
|
||||||
multi_parser.print_token(multi_parser.token_text);
|
|
||||||
multi_parser.indent();
|
|
||||||
multi_parser.current_mode = 'CONTENT';
|
|
||||||
break;
|
|
||||||
case 'TK_TAG_STYLE':
|
|
||||||
case 'TK_TAG_SCRIPT':
|
|
||||||
multi_parser.print_newline(false, multi_parser.output);
|
|
||||||
multi_parser.print_token(multi_parser.token_text);
|
|
||||||
multi_parser.current_mode = 'CONTENT';
|
|
||||||
break;
|
|
||||||
case 'TK_TAG_END':
|
|
||||||
//Print new line only if the tag has no content and has child
|
|
||||||
if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
|
|
||||||
var tag_name = multi_parser.token_text.match(/\w+/)[0];
|
|
||||||
var tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length -1].match(/<\s*(\w+)/);
|
|
||||||
if (tag_extracted_from_last_output === null || tag_extracted_from_last_output[1] !== tag_name) {
|
|
||||||
multi_parser.print_newline(true, multi_parser.output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
multi_parser.print_token(multi_parser.token_text);
|
|
||||||
multi_parser.current_mode = 'CONTENT';
|
|
||||||
break;
|
|
||||||
case 'TK_TAG_SINGLE':
|
|
||||||
// Don't add a newline before elements that should remain unformatted.
|
|
||||||
var tag_check = multi_parser.token_text.match(/^\s*<([a-z]+)/i);
|
|
||||||
if (!tag_check || !multi_parser.Utils.in_array(tag_check[1], unformatted)){
|
|
||||||
multi_parser.print_newline(false, multi_parser.output);
|
|
||||||
}
|
|
||||||
multi_parser.print_token(multi_parser.token_text);
|
|
||||||
multi_parser.current_mode = 'CONTENT';
|
|
||||||
break;
|
|
||||||
case 'TK_CONTENT':
|
|
||||||
if (multi_parser.token_text !== '') {
|
|
||||||
multi_parser.print_token(multi_parser.token_text);
|
|
||||||
}
|
|
||||||
multi_parser.current_mode = 'TAG';
|
|
||||||
break;
|
|
||||||
case 'TK_STYLE':
|
|
||||||
case 'TK_SCRIPT':
|
|
||||||
if (multi_parser.token_text !== '') {
|
|
||||||
multi_parser.output.push('\n');
|
|
||||||
var text = multi_parser.token_text,
|
|
||||||
_beautifier,
|
|
||||||
script_indent_level = 1;
|
|
||||||
if (multi_parser.token_type === 'TK_SCRIPT') {
|
|
||||||
_beautifier = typeof js_beautify === 'function' && js_beautify;
|
|
||||||
} else if (multi_parser.token_type === 'TK_STYLE') {
|
|
||||||
_beautifier = typeof css_beautify === 'function' && css_beautify;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.indent_scripts === "keep") {
|
|
||||||
script_indent_level = 0;
|
|
||||||
} else if (options.indent_scripts === "separate") {
|
|
||||||
script_indent_level = -multi_parser.indent_level;
|
|
||||||
}
|
|
||||||
|
|
||||||
var indentation = multi_parser.get_full_indent(script_indent_level);
|
|
||||||
if (_beautifier) {
|
|
||||||
// call the Beautifier if avaliable
|
|
||||||
text = _beautifier(text.replace(/^\s*/, indentation), options);
|
|
||||||
} else {
|
|
||||||
// simply indent the string otherwise
|
|
||||||
var white = text.match(/^\s*/)[0];
|
|
||||||
var _level = white.match(/[^\n\r]*$/)[0].split(multi_parser.indent_string).length - 1;
|
|
||||||
var reindent = multi_parser.get_full_indent(script_indent_level -_level);
|
|
||||||
text = text.replace(/^\s*/, indentation)
|
|
||||||
.replace(/\r\n|\r|\n/g, '\n' + reindent)
|
|
||||||
.replace(/\s*$/, '');
|
|
||||||
}
|
|
||||||
if (text) {
|
|
||||||
multi_parser.print_token(text);
|
|
||||||
multi_parser.print_newline(true, multi_parser.output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
multi_parser.current_mode = 'TAG';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
multi_parser.last_token = multi_parser.token_type;
|
|
||||||
multi_parser.last_text = multi_parser.token_text;
|
|
||||||
}
|
|
||||||
return multi_parser.output.join('');
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we're running a web page and don't have either of the above, add our one global
|
|
||||||
window.html_beautify = function(html_source, options) {
|
|
||||||
return style_html(html_source, options, window.js_beautify, window.css_beautify);
|
|
||||||
};
|
|
||||||
|
|
||||||
}());
|
|
||||||
@@ -1,620 +0,0 @@
|
|||||||
/*!
|
|
||||||
* jQuery blockUI plugin
|
|
||||||
* Version 2.70.0-2014.11.23
|
|
||||||
* Requires jQuery v1.7 or later
|
|
||||||
*
|
|
||||||
* Examples at: http://malsup.com/jquery/block/
|
|
||||||
* Copyright (c) 2007-2013 M. Alsup
|
|
||||||
* Dual licensed under the MIT and GPL licenses:
|
|
||||||
* http://www.opensource.org/licenses/mit-license.php
|
|
||||||
* http://www.gnu.org/licenses/gpl.html
|
|
||||||
*
|
|
||||||
* Thanks to Amir-Hossein Sobhi for some excellent contributions!
|
|
||||||
*/
|
|
||||||
|
|
||||||
;(function() {
|
|
||||||
/*jshint eqeqeq:false curly:false latedef:false */
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
function setup($) {
|
|
||||||
$.fn._fadeIn = $.fn.fadeIn;
|
|
||||||
|
|
||||||
var noOp = $.noop || function() {};
|
|
||||||
|
|
||||||
// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle
|
|
||||||
// confusing userAgent strings on Vista)
|
|
||||||
var msie = /MSIE/.test(navigator.userAgent);
|
|
||||||
var ie6 = /MSIE 6.0/.test(navigator.userAgent) && ! /MSIE 8.0/.test(navigator.userAgent);
|
|
||||||
var mode = document.documentMode || 0;
|
|
||||||
var setExpr = $.isFunction( document.createElement('div').style.setExpression );
|
|
||||||
|
|
||||||
// global $ methods for blocking/unblocking the entire page
|
|
||||||
$.blockUI = function(opts) { install(window, opts); };
|
|
||||||
$.unblockUI = function(opts) { remove(window, opts); };
|
|
||||||
|
|
||||||
// convenience method for quick growl-like notifications (http://www.google.com/search?q=growl)
|
|
||||||
$.growlUI = function(title, message, timeout, onClose) {
|
|
||||||
var $m = $('<div class="growlUI"></div>');
|
|
||||||
if (title) $m.append('<h1>'+title+'</h1>');
|
|
||||||
if (message) $m.append('<h2>'+message+'</h2>');
|
|
||||||
if (timeout === undefined) timeout = 3000;
|
|
||||||
|
|
||||||
// Added by konapun: Set timeout to 30 seconds if this growl is moused over, like normal toast notifications
|
|
||||||
var callBlock = function(opts) {
|
|
||||||
opts = opts || {};
|
|
||||||
|
|
||||||
$.blockUI({
|
|
||||||
message: $m,
|
|
||||||
fadeIn : typeof opts.fadeIn !== 'undefined' ? opts.fadeIn : 700,
|
|
||||||
fadeOut: typeof opts.fadeOut !== 'undefined' ? opts.fadeOut : 1000,
|
|
||||||
timeout: typeof opts.timeout !== 'undefined' ? opts.timeout : timeout,
|
|
||||||
centerY: false,
|
|
||||||
showOverlay: false,
|
|
||||||
onUnblock: onClose,
|
|
||||||
css: $.blockUI.defaults.growlCSS
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
callBlock();
|
|
||||||
var nonmousedOpacity = $m.css('opacity');
|
|
||||||
$m.mouseover(function() {
|
|
||||||
callBlock({
|
|
||||||
fadeIn: 0,
|
|
||||||
timeout: 30000
|
|
||||||
});
|
|
||||||
|
|
||||||
var displayBlock = $('.blockMsg');
|
|
||||||
displayBlock.stop(); // cancel fadeout if it has started
|
|
||||||
displayBlock.fadeTo(300, 1); // make it easier to read the message by removing transparency
|
|
||||||
}).mouseout(function() {
|
|
||||||
$('.blockMsg').fadeOut(1000);
|
|
||||||
});
|
|
||||||
// End konapun additions
|
|
||||||
};
|
|
||||||
|
|
||||||
// plugin method for blocking element content
|
|
||||||
$.fn.block = function(opts) {
|
|
||||||
if ( this[0] === window ) {
|
|
||||||
$.blockUI( opts );
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
var fullOpts = $.extend({}, $.blockUI.defaults, opts || {});
|
|
||||||
this.each(function() {
|
|
||||||
var $el = $(this);
|
|
||||||
if (fullOpts.ignoreIfBlocked && $el.data('blockUI.isBlocked'))
|
|
||||||
return;
|
|
||||||
$el.unblock({ fadeOut: 0 });
|
|
||||||
});
|
|
||||||
|
|
||||||
return this.each(function() {
|
|
||||||
if ($.css(this,'position') == 'static') {
|
|
||||||
this.style.position = 'relative';
|
|
||||||
$(this).data('blockUI.static', true);
|
|
||||||
}
|
|
||||||
this.style.zoom = 1; // force 'hasLayout' in ie
|
|
||||||
install(this, opts);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
// plugin method for unblocking element content
|
|
||||||
$.fn.unblock = function(opts) {
|
|
||||||
if ( this[0] === window ) {
|
|
||||||
$.unblockUI( opts );
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
return this.each(function() {
|
|
||||||
remove(this, opts);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$.blockUI.version = 2.70; // 2nd generation blocking at no extra cost!
|
|
||||||
|
|
||||||
// override these in your code to change the default behavior and style
|
|
||||||
$.blockUI.defaults = {
|
|
||||||
// message displayed when blocking (use null for no message)
|
|
||||||
message: '<div class="loaderbox"><div class="loading-activity"></div> 加载中......</div>',
|
|
||||||
|
|
||||||
title: null, // title string; only used when theme == true
|
|
||||||
draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded)
|
|
||||||
|
|
||||||
theme: false, // set to true to use with jQuery UI themes
|
|
||||||
|
|
||||||
// styles for the message when blocking; if you wish to disable
|
|
||||||
// these and use an external stylesheet then do this in your code:
|
|
||||||
// $.blockUI.defaults.css = {};
|
|
||||||
css: {
|
|
||||||
padding: 0,
|
|
||||||
margin: 0,
|
|
||||||
width: '30%',
|
|
||||||
top: '40%',
|
|
||||||
left: '35%',
|
|
||||||
textAlign: 'center',
|
|
||||||
color: '#000',
|
|
||||||
border: '0px',
|
|
||||||
backgroundColor:'transparent',
|
|
||||||
cursor: 'wait'
|
|
||||||
},
|
|
||||||
|
|
||||||
// minimal style set used when themes are used
|
|
||||||
themedCSS: {
|
|
||||||
width: '30%',
|
|
||||||
top: '40%',
|
|
||||||
left: '35%'
|
|
||||||
},
|
|
||||||
|
|
||||||
// styles for the overlay
|
|
||||||
overlayCSS: {
|
|
||||||
backgroundColor: '#000',
|
|
||||||
opacity: 0.6,
|
|
||||||
cursor: 'wait'
|
|
||||||
},
|
|
||||||
|
|
||||||
// style to replace wait cursor before unblocking to correct issue
|
|
||||||
// of lingering wait cursor
|
|
||||||
cursorReset: 'default',
|
|
||||||
|
|
||||||
// styles applied when using $.growlUI
|
|
||||||
growlCSS: {
|
|
||||||
width: '350px',
|
|
||||||
top: '10px',
|
|
||||||
left: '',
|
|
||||||
right: '10px',
|
|
||||||
border: 'none',
|
|
||||||
padding: '5px',
|
|
||||||
opacity: 0.6,
|
|
||||||
cursor: 'default',
|
|
||||||
color: '#fff',
|
|
||||||
backgroundColor: '#000',
|
|
||||||
'-webkit-border-radius':'10px',
|
|
||||||
'-moz-border-radius': '10px',
|
|
||||||
'border-radius': '10px'
|
|
||||||
},
|
|
||||||
|
|
||||||
// IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
|
|
||||||
// (hat tip to Jorge H. N. de Vasconcelos)
|
|
||||||
/*jshint scripturl:true */
|
|
||||||
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
|
|
||||||
|
|
||||||
// force usage of iframe in non-IE browsers (handy for blocking applets)
|
|
||||||
forceIframe: false,
|
|
||||||
|
|
||||||
// z-index for the blocking overlay
|
|
||||||
baseZ: 1000,
|
|
||||||
|
|
||||||
// set these to true to have the message automatically centered
|
|
||||||
centerX: true, // <-- only effects element blocking (page block controlled via css above)
|
|
||||||
centerY: true,
|
|
||||||
|
|
||||||
// allow body element to be stetched in ie6; this makes blocking look better
|
|
||||||
// on "short" pages. disable if you wish to prevent changes to the body height
|
|
||||||
allowBodyStretch: true,
|
|
||||||
|
|
||||||
// enable if you want key and mouse events to be disabled for content that is blocked
|
|
||||||
bindEvents: true,
|
|
||||||
|
|
||||||
// be default blockUI will supress tab navigation from leaving blocking content
|
|
||||||
// (if bindEvents is true)
|
|
||||||
constrainTabKey: true,
|
|
||||||
|
|
||||||
// fadeIn time in millis; set to 0 to disable fadeIn on block
|
|
||||||
fadeIn: 200,
|
|
||||||
|
|
||||||
// fadeOut time in millis; set to 0 to disable fadeOut on unblock
|
|
||||||
fadeOut: 400,
|
|
||||||
|
|
||||||
// time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock
|
|
||||||
timeout: 0,
|
|
||||||
|
|
||||||
// disable if you don't want to show the overlay
|
|
||||||
showOverlay: true,
|
|
||||||
|
|
||||||
// if true, focus will be placed in the first available input field when
|
|
||||||
// page blocking
|
|
||||||
focusInput: true,
|
|
||||||
|
|
||||||
// elements that can receive focus
|
|
||||||
focusableElements: ':input:enabled:visible',
|
|
||||||
|
|
||||||
// suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
|
|
||||||
// no longer needed in 2012
|
|
||||||
// applyPlatformOpacityRules: true,
|
|
||||||
|
|
||||||
// callback method invoked when fadeIn has completed and blocking message is visible
|
|
||||||
onBlock: null,
|
|
||||||
|
|
||||||
// callback method invoked when unblocking has completed; the callback is
|
|
||||||
// passed the element that has been unblocked (which is the window object for page
|
|
||||||
// blocks) and the options that were passed to the unblock call:
|
|
||||||
// onUnblock(element, options)
|
|
||||||
onUnblock: null,
|
|
||||||
|
|
||||||
// callback method invoked when the overlay area is clicked.
|
|
||||||
// setting this will turn the cursor to a pointer, otherwise cursor defined in overlayCss will be used.
|
|
||||||
onOverlayClick: null,
|
|
||||||
|
|
||||||
// don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493
|
|
||||||
quirksmodeOffsetHack: 4,
|
|
||||||
|
|
||||||
// class name of the message block
|
|
||||||
blockMsgClass: 'blockMsg',
|
|
||||||
|
|
||||||
// if it is already blocked, then ignore it (don't unblock and reblock)
|
|
||||||
ignoreIfBlocked: false
|
|
||||||
};
|
|
||||||
|
|
||||||
// private data and functions follow...
|
|
||||||
|
|
||||||
var pageBlock = null;
|
|
||||||
var pageBlockEls = [];
|
|
||||||
|
|
||||||
function install(el, opts) {
|
|
||||||
var css, themedCSS;
|
|
||||||
var full = (el == window);
|
|
||||||
var msg = (opts && opts.message !== undefined ? opts.message : undefined);
|
|
||||||
opts = $.extend({}, $.blockUI.defaults, opts || {});
|
|
||||||
|
|
||||||
if (opts.ignoreIfBlocked && $(el).data('blockUI.isBlocked'))
|
|
||||||
return;
|
|
||||||
|
|
||||||
opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
|
|
||||||
css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
|
|
||||||
if (opts.onOverlayClick)
|
|
||||||
opts.overlayCSS.cursor = 'pointer';
|
|
||||||
|
|
||||||
themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
|
|
||||||
msg = msg === undefined ? opts.message : msg;
|
|
||||||
|
|
||||||
// remove the current block (if there is one)
|
|
||||||
if (full && pageBlock)
|
|
||||||
remove(window, {fadeOut:0});
|
|
||||||
|
|
||||||
// if an existing element is being used as the blocking content then we capture
|
|
||||||
// its current place in the DOM (and current display style) so we can restore
|
|
||||||
// it when we unblock
|
|
||||||
if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) {
|
|
||||||
var node = msg.jquery ? msg[0] : msg;
|
|
||||||
var data = {};
|
|
||||||
$(el).data('blockUI.history', data);
|
|
||||||
data.el = node;
|
|
||||||
data.parent = node.parentNode;
|
|
||||||
data.display = node.style.display;
|
|
||||||
data.position = node.style.position;
|
|
||||||
if (data.parent)
|
|
||||||
data.parent.removeChild(node);
|
|
||||||
}
|
|
||||||
|
|
||||||
$(el).data('blockUI.onUnblock', opts.onUnblock);
|
|
||||||
var z = opts.baseZ;
|
|
||||||
|
|
||||||
// blockUI uses 3 layers for blocking, for simplicity they are all used on every platform;
|
|
||||||
// layer1 is the iframe layer which is used to supress bleed through of underlying content
|
|
||||||
// layer2 is the overlay layer which has opacity and a wait cursor (by default)
|
|
||||||
// layer3 is the message content that is displayed while blocking
|
|
||||||
var lyr1, lyr2, lyr3, s;
|
|
||||||
if (msie || opts.forceIframe)
|
|
||||||
lyr1 = $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>');
|
|
||||||
else
|
|
||||||
lyr1 = $('<div class="blockUI" style="display:none"></div>');
|
|
||||||
|
|
||||||
if (opts.theme)
|
|
||||||
lyr2 = $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>');
|
|
||||||
else
|
|
||||||
lyr2 = $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
|
|
||||||
|
|
||||||
if (opts.theme && full) {
|
|
||||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">';
|
|
||||||
if ( opts.title ) {
|
|
||||||
s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>';
|
|
||||||
}
|
|
||||||
s += '<div class="ui-widget-content ui-dialog-content"></div>';
|
|
||||||
s += '</div>';
|
|
||||||
}
|
|
||||||
else if (opts.theme) {
|
|
||||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">';
|
|
||||||
if ( opts.title ) {
|
|
||||||
s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>';
|
|
||||||
}
|
|
||||||
s += '<div class="ui-widget-content ui-dialog-content"></div>';
|
|
||||||
s += '</div>';
|
|
||||||
}
|
|
||||||
else if (full) {
|
|
||||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>';
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
|
|
||||||
}
|
|
||||||
lyr3 = $(s);
|
|
||||||
|
|
||||||
// if we have a message, style it
|
|
||||||
if (msg) {
|
|
||||||
if (opts.theme) {
|
|
||||||
lyr3.css(themedCSS);
|
|
||||||
lyr3.addClass('ui-widget-content');
|
|
||||||
}
|
|
||||||
else
|
|
||||||
lyr3.css(css);
|
|
||||||
}
|
|
||||||
|
|
||||||
// style the overlay
|
|
||||||
if (!opts.theme /*&& (!opts.applyPlatformOpacityRules)*/)
|
|
||||||
lyr2.css(opts.overlayCSS);
|
|
||||||
lyr2.css('position', full ? 'fixed' : 'absolute');
|
|
||||||
|
|
||||||
// make iframe layer transparent in IE
|
|
||||||
if (msie || opts.forceIframe)
|
|
||||||
lyr1.css('opacity',0.0);
|
|
||||||
|
|
||||||
//$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el);
|
|
||||||
var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el);
|
|
||||||
$.each(layers, function() {
|
|
||||||
this.appendTo($par);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (opts.theme && opts.draggable && $.fn.draggable) {
|
|
||||||
lyr3.draggable({
|
|
||||||
handle: '.ui-dialog-titlebar',
|
|
||||||
cancel: 'li'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling)
|
|
||||||
var expr = setExpr && (!$.support.boxModel || $('object,embed', full ? null : el).length > 0);
|
|
||||||
if (ie6 || expr) {
|
|
||||||
// give body 100% height
|
|
||||||
if (full && opts.allowBodyStretch && $.support.boxModel)
|
|
||||||
$('html,body').css('height','100%');
|
|
||||||
|
|
||||||
// fix ie6 issue when blocked element has a border width
|
|
||||||
if ((ie6 || !$.support.boxModel) && !full) {
|
|
||||||
var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth');
|
|
||||||
var fixT = t ? '(0 - '+t+')' : 0;
|
|
||||||
var fixL = l ? '(0 - '+l+')' : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// simulate fixed position
|
|
||||||
$.each(layers, function(i,o) {
|
|
||||||
var s = o[0].style;
|
|
||||||
s.position = 'absolute';
|
|
||||||
if (i < 2) {
|
|
||||||
if (full)
|
|
||||||
s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.support.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"');
|
|
||||||
else
|
|
||||||
s.setExpression('height','this.parentNode.offsetHeight + "px"');
|
|
||||||
if (full)
|
|
||||||
s.setExpression('width','jQuery.support.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"');
|
|
||||||
else
|
|
||||||
s.setExpression('width','this.parentNode.offsetWidth + "px"');
|
|
||||||
if (fixL) s.setExpression('left', fixL);
|
|
||||||
if (fixT) s.setExpression('top', fixT);
|
|
||||||
}
|
|
||||||
else if (opts.centerY) {
|
|
||||||
if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"');
|
|
||||||
s.marginTop = 0;
|
|
||||||
}
|
|
||||||
else if (!opts.centerY && full) {
|
|
||||||
var top = (opts.css && opts.css.top) ? parseInt(opts.css.top, 10) : 0;
|
|
||||||
var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"';
|
|
||||||
s.setExpression('top',expression);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// show the message
|
|
||||||
if (msg) {
|
|
||||||
if (opts.theme)
|
|
||||||
lyr3.find('.ui-widget-content').append(msg);
|
|
||||||
else
|
|
||||||
lyr3.append(msg);
|
|
||||||
if (msg.jquery || msg.nodeType)
|
|
||||||
$(msg).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((msie || opts.forceIframe) && opts.showOverlay)
|
|
||||||
lyr1.show(); // opacity is zero
|
|
||||||
if (opts.fadeIn) {
|
|
||||||
var cb = opts.onBlock ? opts.onBlock : noOp;
|
|
||||||
var cb1 = (opts.showOverlay && !msg) ? cb : noOp;
|
|
||||||
var cb2 = msg ? cb : noOp;
|
|
||||||
if (opts.showOverlay)
|
|
||||||
lyr2._fadeIn(opts.fadeIn, cb1);
|
|
||||||
if (msg)
|
|
||||||
lyr3._fadeIn(opts.fadeIn, cb2);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (opts.showOverlay)
|
|
||||||
lyr2.show();
|
|
||||||
if (msg)
|
|
||||||
lyr3.show();
|
|
||||||
if (opts.onBlock)
|
|
||||||
opts.onBlock.bind(lyr3)();
|
|
||||||
}
|
|
||||||
|
|
||||||
// bind key and mouse events
|
|
||||||
bind(1, el, opts);
|
|
||||||
|
|
||||||
if (full) {
|
|
||||||
pageBlock = lyr3[0];
|
|
||||||
pageBlockEls = $(opts.focusableElements,pageBlock);
|
|
||||||
if (opts.focusInput)
|
|
||||||
setTimeout(focus, 20);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
center(lyr3[0], opts.centerX, opts.centerY);
|
|
||||||
|
|
||||||
if (opts.timeout) {
|
|
||||||
// auto-unblock
|
|
||||||
var to = setTimeout(function() {
|
|
||||||
if (full)
|
|
||||||
$.unblockUI(opts);
|
|
||||||
else
|
|
||||||
$(el).unblock(opts);
|
|
||||||
}, opts.timeout);
|
|
||||||
$(el).data('blockUI.timeout', to);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove the block
|
|
||||||
function remove(el, opts) {
|
|
||||||
var count;
|
|
||||||
var full = (el == window);
|
|
||||||
var $el = $(el);
|
|
||||||
var data = $el.data('blockUI.history');
|
|
||||||
var to = $el.data('blockUI.timeout');
|
|
||||||
if (to) {
|
|
||||||
clearTimeout(to);
|
|
||||||
$el.removeData('blockUI.timeout');
|
|
||||||
}
|
|
||||||
opts = $.extend({}, $.blockUI.defaults, opts || {});
|
|
||||||
bind(0, el, opts); // unbind events
|
|
||||||
|
|
||||||
if (opts.onUnblock === null) {
|
|
||||||
opts.onUnblock = $el.data('blockUI.onUnblock');
|
|
||||||
$el.removeData('blockUI.onUnblock');
|
|
||||||
}
|
|
||||||
|
|
||||||
var els;
|
|
||||||
if (full) // crazy selector to handle odd field errors in ie6/7
|
|
||||||
els = $('body').children().filter('.blockUI').add('body > .blockUI');
|
|
||||||
else
|
|
||||||
els = $el.find('>.blockUI');
|
|
||||||
|
|
||||||
// fix cursor issue
|
|
||||||
if ( opts.cursorReset ) {
|
|
||||||
if ( els.length > 1 )
|
|
||||||
els[1].style.cursor = opts.cursorReset;
|
|
||||||
if ( els.length > 2 )
|
|
||||||
els[2].style.cursor = opts.cursorReset;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (full)
|
|
||||||
pageBlock = pageBlockEls = null;
|
|
||||||
|
|
||||||
if (opts.fadeOut) {
|
|
||||||
count = els.length;
|
|
||||||
els.stop().fadeOut(opts.fadeOut, function() {
|
|
||||||
if ( --count === 0)
|
|
||||||
reset(els,data,opts,el);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else
|
|
||||||
reset(els, data, opts, el);
|
|
||||||
}
|
|
||||||
|
|
||||||
// move blocking element back into the DOM where it started
|
|
||||||
function reset(els,data,opts,el) {
|
|
||||||
var $el = $(el);
|
|
||||||
if ( $el.data('blockUI.isBlocked') )
|
|
||||||
return;
|
|
||||||
|
|
||||||
els.each(function(i,o) {
|
|
||||||
// remove via DOM calls so we don't lose event handlers
|
|
||||||
if (this.parentNode)
|
|
||||||
this.parentNode.removeChild(this);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (data && data.el) {
|
|
||||||
data.el.style.display = data.display;
|
|
||||||
data.el.style.position = data.position;
|
|
||||||
data.el.style.cursor = 'default'; // #59
|
|
||||||
if (data.parent)
|
|
||||||
data.parent.appendChild(data.el);
|
|
||||||
$el.removeData('blockUI.history');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($el.data('blockUI.static')) {
|
|
||||||
$el.css('position', 'static'); // #22
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof opts.onUnblock == 'function')
|
|
||||||
opts.onUnblock(el,opts);
|
|
||||||
|
|
||||||
// fix issue in Safari 6 where block artifacts remain until reflow
|
|
||||||
var body = $(document.body), w = body.width(), cssW = body[0].style.width;
|
|
||||||
body.width(w-1).width(w);
|
|
||||||
body[0].style.width = cssW;
|
|
||||||
}
|
|
||||||
|
|
||||||
// bind/unbind the handler
|
|
||||||
function bind(b, el, opts) {
|
|
||||||
var full = el == window, $el = $(el);
|
|
||||||
|
|
||||||
// don't bother unbinding if there is nothing to unbind
|
|
||||||
if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked')))
|
|
||||||
return;
|
|
||||||
|
|
||||||
$el.data('blockUI.isBlocked', b);
|
|
||||||
|
|
||||||
// don't bind events when overlay is not in use or if bindEvents is false
|
|
||||||
if (!full || !opts.bindEvents || (b && !opts.showOverlay))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// bind anchors and inputs for mouse and key events
|
|
||||||
var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove';
|
|
||||||
if (b)
|
|
||||||
$(document).bind(events, opts, handler);
|
|
||||||
else
|
|
||||||
$(document).unbind(events, handler);
|
|
||||||
|
|
||||||
// former impl...
|
|
||||||
// var $e = $('a,:input');
|
|
||||||
// b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
// event handler to suppress keyboard/mouse events when blocking
|
|
||||||
function handler(e) {
|
|
||||||
// allow tab navigation (conditionally)
|
|
||||||
if (e.type === 'keydown' && e.keyCode && e.keyCode == 9) {
|
|
||||||
if (pageBlock && e.data.constrainTabKey) {
|
|
||||||
var els = pageBlockEls;
|
|
||||||
var fwd = !e.shiftKey && e.target === els[els.length-1];
|
|
||||||
var back = e.shiftKey && e.target === els[0];
|
|
||||||
if (fwd || back) {
|
|
||||||
setTimeout(function(){focus(back);},10);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var opts = e.data;
|
|
||||||
var target = $(e.target);
|
|
||||||
if (target.hasClass('blockOverlay') && opts.onOverlayClick)
|
|
||||||
opts.onOverlayClick(e);
|
|
||||||
|
|
||||||
// allow events within the message content
|
|
||||||
if (target.parents('div.' + opts.blockMsgClass).length > 0)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
// allow events for content that is not being blocked
|
|
||||||
return target.parents().children().filter('div.blockUI').length === 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
function focus(back) {
|
|
||||||
if (!pageBlockEls)
|
|
||||||
return;
|
|
||||||
var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
|
|
||||||
if (e)
|
|
||||||
e.focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function center(el, x, y) {
|
|
||||||
var p = el.parentNode, s = el.style;
|
|
||||||
var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth');
|
|
||||||
var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth');
|
|
||||||
if (x) s.left = l > 0 ? (l+'px') : '0';
|
|
||||||
if (y) s.top = t > 0 ? (t+'px') : '0';
|
|
||||||
}
|
|
||||||
|
|
||||||
function sz(el, p) {
|
|
||||||
return parseInt($.css(el,p),10)||0;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*global define:true */
|
|
||||||
if (typeof define === 'function' && define.amd && define.amd.jQuery) {
|
|
||||||
define(['jquery'], setup);
|
|
||||||
} else {
|
|
||||||
setup(jQuery);
|
|
||||||
}
|
|
||||||
|
|
||||||
})();
|
|
||||||
@@ -1,563 +0,0 @@
|
|||||||
/*!
|
|
||||||
* bootstrap-fileinput v5.1.3
|
|
||||||
* http://plugins.krajee.com/file-input
|
|
||||||
*
|
|
||||||
* Krajee default styling for bootstrap-fileinput.
|
|
||||||
*
|
|
||||||
* Author: Kartik Visweswaran
|
|
||||||
* Copyright: 2014 - 2020, Kartik Visweswaran, Krajee.com
|
|
||||||
*
|
|
||||||
* Licensed under the BSD-3-Clause
|
|
||||||
* https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
|
|
||||||
*/
|
|
||||||
.file-loading input[type=file], input[type=file].file-loading {
|
|
||||||
width: 0;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-no-browse {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
bottom: 20%;
|
|
||||||
width: 1px;
|
|
||||||
height: 1px;
|
|
||||||
font-size: 0;
|
|
||||||
opacity: 0;
|
|
||||||
border: none;
|
|
||||||
background: none;
|
|
||||||
outline: none;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.kv-hidden, .file-caption-icon, .file-zoom-dialog .modal-header:before, .file-zoom-dialog .modal-header:after, .file-input-new .file-preview, .file-input-new .close, .file-input-new .glyphicon-file, .file-input-new .fileinput-remove-button, .file-input-new .fileinput-upload-button, .file-input-new .no-browse .input-group-btn, .file-input-ajax-new .fileinput-remove-button, .file-input-ajax-new .fileinput-upload-button, .file-input-ajax-new .no-browse .input-group-btn, .hide-content .kv-file-content, .is-locked .fileinput-upload-button, .is-locked .fileinput-remove-button {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-file input[type=file], .file-caption-icon, .file-preview .fileinput-remove, .krajee-default .file-thumb-progress, .file-zoom-dialog .btn-navigate, .file-zoom-dialog .floating-buttons {
|
|
||||||
position: absolute;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption-icon .kv-caption-icon {
|
|
||||||
line-height: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-input, .file-loading:before, .btn-file, .file-caption, .file-preview, .krajee-default.file-preview-frame, .krajee-default .file-thumbnail-footer, .file-zoom-dialog .modal-dialog {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-error-message pre, .file-error-message ul, .krajee-default .file-actions, .krajee-default .file-other-error {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-error-message pre, .file-error-message ul {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-drag-handle, .krajee-default .file-upload-indicator {
|
|
||||||
float: left;
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-thumb-progress .progress, .file-thumb-progress .progress-bar {
|
|
||||||
font-family: Verdana, Helvetica, sans-serif;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-thumb-progress .progress, .kv-upload-progress .progress {
|
|
||||||
background-color: #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-caption-info, .krajee-default .file-size-info {
|
|
||||||
display: block;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
width: 160px;
|
|
||||||
height: 15px;
|
|
||||||
margin: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content > .file-object.type-video, .file-zoom-content > .file-object.type-flash, .file-zoom-content > .file-object.type-image {
|
|
||||||
max-width: 100%;
|
|
||||||
max-height: 100%;
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content > .file-object.type-video, .file-zoom-content > .file-object.type-flash {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content > .file-object.type-pdf, .file-zoom-content > .file-object.type-html, .file-zoom-content > .file-object.type-text, .file-zoom-content > .file-object.type-default {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-loading:before {
|
|
||||||
content: " Loading...";
|
|
||||||
display: inline-block;
|
|
||||||
padding-left: 20px;
|
|
||||||
line-height: 16px;
|
|
||||||
font-size: 13px;
|
|
||||||
font-variant: small-caps;
|
|
||||||
color: #999;
|
|
||||||
background: transparent url(loading.gif) top left no-repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-object {
|
|
||||||
margin: 0 0 -5px 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-file {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-file input[type=file] {
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
min-width: 100%;
|
|
||||||
min-height: 100%;
|
|
||||||
text-align: right;
|
|
||||||
opacity: 0;
|
|
||||||
background: none repeat scroll 0 0 transparent;
|
|
||||||
cursor: inherit;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-file ::-ms-browse {
|
|
||||||
font-size: 10000px;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption .file-caption-name {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
box-shadow: none;
|
|
||||||
border: none;
|
|
||||||
background: none;
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption.icon-visible .file-caption-icon {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption.icon-visible .file-caption-name {
|
|
||||||
padding-left: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption-icon {
|
|
||||||
left: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-error-message {
|
|
||||||
color: #a94442;
|
|
||||||
background-color: #f2dede;
|
|
||||||
margin: 5px;
|
|
||||||
border: 1px solid #ebccd1;
|
|
||||||
border-radius: 4px;
|
|
||||||
padding: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-error-message pre {
|
|
||||||
margin: 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption-disabled {
|
|
||||||
background-color: #eee;
|
|
||||||
cursor: not-allowed;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview {
|
|
||||||
border-radius: 5px;
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
padding: 8px;
|
|
||||||
width: 100%;
|
|
||||||
margin-bottom: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview .btn-xs {
|
|
||||||
padding: 1px 5px;
|
|
||||||
font-size: 12px;
|
|
||||||
line-height: 1.5;
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview .fileinput-remove {
|
|
||||||
top: 1px;
|
|
||||||
right: 1px;
|
|
||||||
line-height: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview .clickable {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview-image {
|
|
||||||
font: 40px Impact, Charcoal, sans-serif;
|
|
||||||
color: #008000;
|
|
||||||
width:auto;
|
|
||||||
height:auto;
|
|
||||||
max-width:100%;
|
|
||||||
max-height:100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame {
|
|
||||||
margin: 8px;
|
|
||||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
|
||||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
|
|
||||||
padding: 6px;
|
|
||||||
float: left;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame .kv-file-content {
|
|
||||||
width: 213px;
|
|
||||||
height: 160px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-other-frame {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame .kv-file-content.kv-pdf-rendered {
|
|
||||||
width: 400px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame[data-template="audio"] .kv-file-content {
|
|
||||||
width: 240px;
|
|
||||||
height: 55px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame .file-thumbnail-footer {
|
|
||||||
height: 70px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.file-preview-frame:not(.file-preview-error):hover {
|
|
||||||
border: 1px solid rgba(0, 0, 0, 0.3);
|
|
||||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-text {
|
|
||||||
color: #428bca;
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
outline: none;
|
|
||||||
resize: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-html {
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-other-icon {
|
|
||||||
font-size: 6em;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-footer-buttons {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-footer-caption {
|
|
||||||
display: block;
|
|
||||||
text-align: center;
|
|
||||||
padding-top: 4px;
|
|
||||||
font-size: 11px;
|
|
||||||
color: #777;
|
|
||||||
margin-bottom: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-upload-stats {
|
|
||||||
font-size: 10px;
|
|
||||||
text-align: center;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.kv-upload-progress .file-upload-stats {
|
|
||||||
font-size: 12px;
|
|
||||||
margin: -10px 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-error {
|
|
||||||
opacity: 0.65;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-thumb-progress {
|
|
||||||
top: 37px;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default.kvsortable-ghost {
|
|
||||||
background: #e1edf7;
|
|
||||||
border: 2px solid #a1abff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-other:hover {
|
|
||||||
opacity: 0.8;
|
|
||||||
}
|
|
||||||
|
|
||||||
.krajee-default .file-preview-frame:not(.file-preview-error) .file-footer-caption:hover {
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.kv-upload-progress .progress {
|
|
||||||
height: 20px;
|
|
||||||
margin: 10px 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.kv-upload-progress .progress-bar {
|
|
||||||
height: 20px;
|
|
||||||
font-family: Verdana, Helvetica, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*noinspection CssOverwrittenProperties*/
|
|
||||||
.file-zoom-dialog .file-other-icon {
|
|
||||||
font-size: 22em;
|
|
||||||
font-size: 50vmin;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .modal-dialog {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .modal-header {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .btn-navigate {
|
|
||||||
padding: 0;
|
|
||||||
margin: -60px 0 0;
|
|
||||||
font-size: 60px;
|
|
||||||
background: transparent;
|
|
||||||
text-decoration: none;
|
|
||||||
outline: none;
|
|
||||||
opacity: 0.7;
|
|
||||||
top: 50%;
|
|
||||||
color: #1c94c4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .btn-navigate:not([disabled]):hover {
|
|
||||||
outline: none;
|
|
||||||
box-shadow: none;
|
|
||||||
opacity: 0.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .floating-buttons {
|
|
||||||
top: 5px;
|
|
||||||
right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .btn-navigate[disabled] {
|
|
||||||
opacity: 0.3;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .btn-prev {
|
|
||||||
left: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .btn-next {
|
|
||||||
right: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .kv-zoom-title {
|
|
||||||
font-weight: 300;
|
|
||||||
color: #999;
|
|
||||||
max-width: 50%;
|
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-input-new .no-browse .form-control {
|
|
||||||
border-top-right-radius: 4px;
|
|
||||||
border-bottom-right-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-input-ajax-new .no-browse .form-control {
|
|
||||||
border-top-right-radius: 4px;
|
|
||||||
border-bottom-right-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-caption-main {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-thumb-loading {
|
|
||||||
background: transparent url(loading.gif) no-repeat scroll center center content-box !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-drop-zone {
|
|
||||||
border: 1px dashed #aaa;
|
|
||||||
min-height: 260px;
|
|
||||||
border-radius: 4px;
|
|
||||||
text-align: center;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin: 12px 15px 12px 12px;
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-drop-zone.clickable:hover {
|
|
||||||
border: 2px dashed #999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-drop-zone.clickable:focus {
|
|
||||||
border: 2px solid #5acde2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-drop-zone .file-preview-thumbnails {
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-drop-zone-title {
|
|
||||||
color: #aaa;
|
|
||||||
font-size: 1.6em;
|
|
||||||
text-align:center;
|
|
||||||
padding: 85px 10px;
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-highlighted {
|
|
||||||
border: 2px dashed #999 !important;
|
|
||||||
background-color: #eee;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-uploading {
|
|
||||||
background: url(loading-sm.gif) no-repeat center bottom 10px;
|
|
||||||
opacity: 0.65;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-fullscreen .modal-dialog {
|
|
||||||
min-width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-fullscreen .modal-content {
|
|
||||||
border-radius: 0;
|
|
||||||
box-shadow: none;
|
|
||||||
min-height: 100vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-fullscreen .modal-body {
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.floating-buttons {
|
|
||||||
z-index: 3000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.floating-buttons .btn-kv {
|
|
||||||
margin-left: 3px;
|
|
||||||
z-index: 3000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.kv-zoom-actions .btn-kv {
|
|
||||||
margin-left: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content {
|
|
||||||
text-align: center;
|
|
||||||
min-height: 300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content .file-preview-image {
|
|
||||||
max-height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content .file-preview-video {
|
|
||||||
max-height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content > .file-object.type-image {
|
|
||||||
height: auto;
|
|
||||||
min-height: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-content > .file-object.type-audio {
|
|
||||||
width: auto;
|
|
||||||
height: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 576px) {
|
|
||||||
.file-zoom-dialog .modal-dialog {
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 992px) {
|
|
||||||
.file-zoom-dialog .modal-lg {
|
|
||||||
max-width: 800px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 767px) {
|
|
||||||
.file-preview-thumbnails {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-zoom-dialog .modal-header {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 350px) {
|
|
||||||
.krajee-default.file-preview-frame:not([data-template="audio"]) .kv-file-content {
|
|
||||||
width: 160px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 420px) {
|
|
||||||
.krajee-default.file-preview-frame .kv-file-content.kv-pdf-rendered {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-loading[dir=rtl]:before {
|
|
||||||
background: transparent url(loading.gif) top right no-repeat;
|
|
||||||
padding-left: 0;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.clickable .file-drop-zone-title {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-sortable .file-drag-handle:hover {
|
|
||||||
opacity: 0.7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-sortable .file-drag-handle {
|
|
||||||
cursor: grab;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-grabbing, .file-grabbing * {
|
|
||||||
cursor: not-allowed !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-grabbing .file-preview-thumbnails * {
|
|
||||||
cursor: grabbing !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview-frame.sortable-chosen {
|
|
||||||
background-color: #d9edf7;
|
|
||||||
border-color: #17a2b8;
|
|
||||||
box-shadow: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-preview .kv-zoom-cache {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
-13
@@ -1,13 +0,0 @@
|
|||||||
/*!
|
|
||||||
* bootstrap-fileinput v5.1.3
|
|
||||||
* http://plugins.krajee.com/file-input
|
|
||||||
*
|
|
||||||
* Krajee default styling for bootstrap-fileinput.
|
|
||||||
*
|
|
||||||
* Author: Kartik Visweswaran
|
|
||||||
* Copyright: 2014 - 2020, Kartik Visweswaran, Krajee.com
|
|
||||||
*
|
|
||||||
* Licensed under the BSD-3-Clause
|
|
||||||
* https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
|
|
||||||
*/
|
|
||||||
.file-loading input[type=file],input[type=file].file-loading{width:0;height:0}.file-no-browse{position:absolute;left:50%;bottom:20%;width:1px;height:1px;font-size:0;opacity:0;border:0;background:0;outline:0;box-shadow:none}.kv-hidden,.file-caption-icon,.file-zoom-dialog .modal-header:before,.file-zoom-dialog .modal-header:after,.file-input-new .file-preview,.file-input-new .close,.file-input-new .glyphicon-file,.file-input-new .fileinput-remove-button,.file-input-new .fileinput-upload-button,.file-input-new .no-browse .input-group-btn,.file-input-ajax-new .fileinput-remove-button,.file-input-ajax-new .fileinput-upload-button,.file-input-ajax-new .no-browse .input-group-btn,.hide-content .kv-file-content,.is-locked .fileinput-upload-button,.is-locked .fileinput-remove-button{display:none}.btn-file input[type=file],.file-caption-icon,.file-preview .fileinput-remove,.krajee-default .file-thumb-progress,.file-zoom-dialog .btn-navigate,.file-zoom-dialog .floating-buttons{position:absolute}.file-caption-icon .kv-caption-icon{line-height:inherit}.file-input,.file-loading:before,.btn-file,.file-caption,.file-preview,.krajee-default.file-preview-frame,.krajee-default .file-thumbnail-footer,.file-zoom-dialog .modal-dialog{position:relative}.file-error-message pre,.file-error-message ul,.krajee-default .file-actions,.krajee-default .file-other-error{text-align:left}.file-error-message pre,.file-error-message ul{margin:0}.krajee-default .file-drag-handle,.krajee-default .file-upload-indicator{float:left;margin-top:10px;width:16px;height:16px}.file-thumb-progress .progress,.file-thumb-progress .progress-bar{font-family:Verdana,Helvetica,sans-serif;font-size:.7rem}.krajee-default .file-thumb-progress .progress,.kv-upload-progress .progress{background-color:#ccc}.krajee-default .file-caption-info,.krajee-default .file-size-info{display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:160px;height:15px;margin:auto}.file-zoom-content>.file-object.type-video,.file-zoom-content>.file-object.type-flash,.file-zoom-content>.file-object.type-image{max-width:100%;max-height:100%;width:auto}.file-zoom-content>.file-object.type-video,.file-zoom-content>.file-object.type-flash{height:100%}.file-zoom-content>.file-object.type-pdf,.file-zoom-content>.file-object.type-html,.file-zoom-content>.file-object.type-text,.file-zoom-content>.file-object.type-default{width:100%}.file-loading:before{content:" Loading...";display:inline-block;padding-left:20px;line-height:16px;font-size:13px;font-variant:small-caps;color:#999;background:transparent url(loading.gif) top left no-repeat}.file-object{margin:0 0 -5px 0;padding:0}.btn-file{overflow:hidden}.btn-file input[type=file]{top:0;left:0;min-width:100%;min-height:100%;text-align:right;opacity:0;background:none repeat scroll 0 0 transparent;cursor:inherit;display:block}.btn-file ::-ms-browse{font-size:10000px;width:100%;height:100%}.file-caption .file-caption-name{width:100%;margin:0;padding:0;box-shadow:none;border:0;background:0;outline:0}.file-caption.icon-visible .file-caption-icon{display:inline-block}.file-caption.icon-visible .file-caption-name{padding-left:15px}.file-caption-icon{left:8px}.file-error-message{color:#a94442;background-color:#f2dede;margin:5px;border:1px solid #ebccd1;border-radius:4px;padding:15px}.file-error-message pre{margin:5px 0}.file-caption-disabled{background-color:#eee;cursor:not-allowed;opacity:1}.file-preview{border-radius:5px;border:1px solid #ddd;padding:8px;width:100%;margin-bottom:5px}.file-preview .btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.file-preview .fileinput-remove{top:1px;right:1px;line-height:10px}.file-preview .clickable{cursor:pointer}.file-preview-image{font:40px Impact,Charcoal,sans-serif;color:#008000;width:auto;height:auto;max-width:100%;max-height:100%}.krajee-default.file-preview-frame{margin:8px;border:1px solid rgba(0,0,0,0.2);box-shadow:0 0 10px 0 rgba(0,0,0,0.2);padding:6px;float:left;text-align:center}.krajee-default.file-preview-frame .kv-file-content{width:213px;height:160px}.krajee-default .file-preview-other-frame{display:flex;align-items:center;justify-content:center}.krajee-default.file-preview-frame .kv-file-content.kv-pdf-rendered{width:400px}.krajee-default.file-preview-frame[data-template="audio"] .kv-file-content{width:240px;height:55px}.krajee-default.file-preview-frame .file-thumbnail-footer{height:70px}.krajee-default.file-preview-frame:not(.file-preview-error):hover{border:1px solid rgba(0,0,0,0.3);box-shadow:0 0 10px 0 rgba(0,0,0,0.4)}.krajee-default .file-preview-text{color:#428bca;border:1px solid #ddd;outline:0;resize:none}.krajee-default .file-preview-html{border:1px solid #ddd}.krajee-default .file-other-icon{font-size:6em;line-height:1}.krajee-default .file-footer-buttons{float:right}.krajee-default .file-footer-caption{display:block;text-align:center;padding-top:4px;font-size:11px;color:#777;margin-bottom:30px}.file-upload-stats{font-size:10px;text-align:center;widLine truncated
|
|
||||||
-11
@@ -1,11 +0,0 @@
|
|||||||
/*!
|
|
||||||
* bootstrap-fileinput v5.1.3
|
|
||||||
* http://plugins.krajee.com/file-input
|
|
||||||
*
|
|
||||||
* Author: Kartik Visweswaran
|
|
||||||
* Copyright: 2014 - 2020, Kartik Visweswaran, Krajee.com
|
|
||||||
*
|
|
||||||
* Licensed under the BSD-3-Clause
|
|
||||||
* https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
|
|
||||||
*/
|
|
||||||
!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=e(require("jquery")):e(window.jQuery)}(function(e){e.fn.fileinputLocales={},e.fn.fileinputThemes={},String.prototype.setTokens=function(e){var t,i,a=""+this;for(t in e){e.hasOwnProperty(t)&&(i=RegExp("{"+t+"}","g"),a=a.replace(i,e[t]))}return a},Array.prototype.flatMap||(Array.prototype.flatMap=function(e){return[].concat(this.map(e))});var t,i;t={FRAMES:".kv-preview-thumb",SORT_CSS:"file-sortable",INIT_FLAG:"init-",OBJECT_PARAMS:'<param name="controller" value="true" />\n<param name="allowFullScreen" value="true" />\n<param name="allowScriptAccess" value="always" />\n<param name="autoPlay" value="false" />\n<param name="autoStart" value="false" />\n<param name="quality" value="high" />\n',DEFAULT_PREVIEW:'<div class="file-preview-other">\n<span class="{previewFileIconClass}">{previewFileIcon}</span>\n</div>',MODAL_ID:"kvFileinputModal",MODAL_EVENTS:["show","shown","hide","hidden","loaded"],logMessages:{ajaxError:"{status}: {error}. Error Details: {text}.",badDroppedFiles:"Error scanning dropped files!",badExifParser:"Error loading the piexif.js library. {details}",badInputType:'The input "type" must be set to "file" for initializing the "bootstrap-fileinput" plugin.',exifWarning:'To avoid this warning, either set "autoOrientImage" to "false" OR ensure you have loaded the "piexif.js" library correctly on your page before the "fileinput.js" script.',invalidChunkSize:'Invalid upload chunk size: "{chunkSize}". Resumable uploads are disabled.',invalidThumb:'Invalid thumb frame with id: "{id}".',noResumableSupport:"The browser does not support resumable or chunk uploads.",noUploadUrl:'The "uploadUrl" is not set. Ajax uploads and resumable uploads have been disabled.',retryStatus:"Retrying upload for chunk # {chunk} for {filename}... retry # {retry}.",chunkQueueError:"Could not push task to ajax pool for chunk index # {index}.",resumableMaxRetriesReached:"Maximum resumable ajax retries ({n}) reached.",resumableRetryError:"Could not retry the resumable request (try # {n})... aborting.",resumableAborting:"Aborting / cancelling the resumable request."},objUrl:window.URL||window.webkitURL,now:function(){return(new Date).getTime()},round:function(e){return e=parseFloat(e),isNaN(e)?0:Math.floor(Math.round(e))},getArray:function(e){var t,i=[],a=e&&e.length||0;for(t=0;a>t;t++){i.push(e[t])}return i},getFileRelativePath:function(e){return(e.newPath||e.relativePath||e.webkitRelativePath||t.getFileName(e)||null)+""},getFileId:function(e,i){var a=t.getFileRelativePath(e);return"function"==typeof i?i(e):e&&a?e.size+"_"+encodeURIComponent(a).replace(/%/g,"_"):null},getFrameSelector:function(e,t){return t=t||"",'[id="'+e+'"]'+t},getZoomSelector:function(e,i){return t.getFrameSelector("zoom-"+e,i)},getFrameElement:function(e,i,a){return e.find(t.getFrameSelector(i,a))},getZoomElement:function(e,i,a){return e.find(t.getZoomSelector(i,a))},getElapsed:function(i){var a=i,r="",n={},o={year:31536000,month:2592000,week:604800,day:86400,hour:3600,minute:60,second:1};return t.getObjectKeys(o).forEach(function(e){n[e]=Math.floor(a/o[e]),a-=n[e]*o[e]}),e.each(n,function(e,t){t>0&&(r+=(r?" ":"")+t+e.substring(0,1))}),r},debounce:function(e,t){var i;return function(){var a=arguments,r=this;clearTimeout(i),i=setTimeout(function(){e.apply(r,a)},t)}},stopEvent:function(e){e.stopPropagation(),e.preventDefault()},getFileName:function(e){return e?e.fileName||e.name||"":""},createObjectURL:function(e){return t.objUrl&&t.objUrl.createObjectURL&&e?t.objUrl.createObjectURL(e):""},revokeObjectURL:function(e){t.objUrl&&t.objUrl.revokeObjectURL&&e&&t.objUrl.revokeObjectURL(e)},compare:function(e,t,i){return void 0!==e&&(i?e===t:e.match(t))},isIE:function(e){var t,i;return"Microsoft Internet Explorer"!==navigator.appName?!1:10===e?RegExp("msie\\s"+e,"i").test(navigator.userAgent):(t=document.createElement("div"),t.innerHTML="<!--[if IE "+e+"]> <i></i> <![endif]-->",i=t.getElementsByTagName("i").length,document.body.appendChild(t),t.parentNode.removeChild(t),i)},canOrientImage:function(t){var i=e(document.createElement("img")).css({width:"1px",height:"1px"}).insertAfter(t),a=i.css("image-orientation");return i.remove(),!!a},canAssignFilesToInput:function(){var e=document.createElement("input");try{return e.type="file",e.files=null,!0}catch(t){return !1}},getDragDropFolders:function(e){var t,i,a=e?e.length:0,r=0;if(a>0&&e[0].webkitGetAsEntry()){for(t=0;a>t;t++){i=e[t].webkitGetAsEntry(),i&&i.isDirectory&&r++}}return r},initModal:function(t){var i=e("body");i.length&&t.appendTo(i)},isFunction:function(e){return"function"==typeof e},isEmpty:function(i,a){return void 0===i||null===i||!t.isFunction(i)&&(0===i.length||a&&""===e.trim(i))},isArray:function(e){return Array.isArray(e)||"[object Array]"===Object.prototype.toString.call(e)},ifSet:function(e,t,i){return i=i||"",t&&"object"==typeof t&&e in t?t[e]:i},cleanArray:function(e){retuLine truncated
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 847 B |
-429
@@ -1,429 +0,0 @@
|
|||||||
/*!
|
|
||||||
* Bootstrap-select v1.13.10 (https://developer.snapappointments.com/bootstrap-select)
|
|
||||||
*
|
|
||||||
* Copyright 2012-2019 SnapAppointments, LLC
|
|
||||||
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
|
|
||||||
*/
|
|
||||||
|
|
||||||
select.bs-select-hidden,
|
|
||||||
.bootstrap-select > select.bs-select-hidden,
|
|
||||||
select.selectpicker {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select {
|
|
||||||
width: 220px \0;
|
|
||||||
/*IE9 and below*/
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
.bootstrap-select > .dropdown-toggle {
|
|
||||||
position: relative;
|
|
||||||
width: 100%;
|
|
||||||
text-align: right;
|
|
||||||
white-space: nowrap;
|
|
||||||
display: -webkit-inline-box;
|
|
||||||
display: -webkit-inline-flex;
|
|
||||||
display: -ms-inline-flexbox;
|
|
||||||
display: inline-flex;
|
|
||||||
-webkit-box-align: center;
|
|
||||||
-webkit-align-items: center;
|
|
||||||
-ms-flex-align: center;
|
|
||||||
align-items: center;
|
|
||||||
-webkit-box-pack: justify;
|
|
||||||
-webkit-justify-content: space-between;
|
|
||||||
-ms-flex-pack: justify;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
.bootstrap-select > .dropdown-toggle:after {
|
|
||||||
margin-top: -1px;
|
|
||||||
}
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder:active {
|
|
||||||
color: #999;
|
|
||||||
}
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active,
|
|
||||||
.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active {
|
|
||||||
color: rgba(255, 255, 255, 0.5);
|
|
||||||
}
|
|
||||||
.bootstrap-select > select {
|
|
||||||
position: absolute !important;
|
|
||||||
bottom: 0;
|
|
||||||
left: 50%;
|
|
||||||
display: block !important;
|
|
||||||
width: 0.5px !important;
|
|
||||||
height: 100% !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
opacity: 0 !important;
|
|
||||||
border: none;
|
|
||||||
z-index: 0 !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select > select.mobile-device {
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
display: block !important;
|
|
||||||
width: 100% !important;
|
|
||||||
z-index: 2 !important;
|
|
||||||
}
|
|
||||||
.has-error .bootstrap-select .dropdown-toggle,
|
|
||||||
.error .bootstrap-select .dropdown-toggle,
|
|
||||||
.bootstrap-select.is-invalid .dropdown-toggle,
|
|
||||||
.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle {
|
|
||||||
border-color: #b94a48;
|
|
||||||
}
|
|
||||||
.bootstrap-select.is-valid .dropdown-toggle,
|
|
||||||
.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle {
|
|
||||||
border-color: #28a745;
|
|
||||||
}
|
|
||||||
.bootstrap-select.fit-width {
|
|
||||||
width: auto !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
|
|
||||||
width: 220px;
|
|
||||||
}
|
|
||||||
.bootstrap-select > select.mobile-device:focus + .dropdown-toggle,
|
|
||||||
.bootstrap-select .dropdown-toggle:focus {
|
|
||||||
outline: thin dotted #333333 !important;
|
|
||||||
outline: 5px auto -webkit-focus-ring-color !important;
|
|
||||||
outline-offset: -2px;
|
|
||||||
}
|
|
||||||
.bootstrap-select.form-control {
|
|
||||||
margin-bottom: 0;
|
|
||||||
padding: 0;
|
|
||||||
border: none;
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.bootstrap-select.form-control.input-group-btn {
|
|
||||||
float: none;
|
|
||||||
z-index: auto;
|
|
||||||
}
|
|
||||||
.form-inline .bootstrap-select,
|
|
||||||
.form-inline .bootstrap-select.form-control:not([class*="col-"]) {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
.bootstrap-select:not(.input-group-btn),
|
|
||||||
.bootstrap-select[class*="col-"] {
|
|
||||||
float: none;
|
|
||||||
display: inline-block;
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
.bootstrap-select.dropdown-menu-right,
|
|
||||||
.bootstrap-select[class*="col-"].dropdown-menu-right,
|
|
||||||
.row .bootstrap-select[class*="col-"].dropdown-menu-right {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
.form-inline .bootstrap-select,
|
|
||||||
.form-horizontal .bootstrap-select,
|
|
||||||
.form-group .bootstrap-select {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
.form-group-lg .bootstrap-select.form-control,
|
|
||||||
.form-group-sm .bootstrap-select.form-control {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.form-group-lg .bootstrap-select.form-control .dropdown-toggle,
|
|
||||||
.form-group-sm .bootstrap-select.form-control .dropdown-toggle {
|
|
||||||
height: 100%;
|
|
||||||
font-size: inherit;
|
|
||||||
line-height: inherit;
|
|
||||||
border-radius: inherit;
|
|
||||||
}
|
|
||||||
.bootstrap-select.form-control-sm .dropdown-toggle,
|
|
||||||
.bootstrap-select.form-control-lg .dropdown-toggle {
|
|
||||||
font-size: inherit;
|
|
||||||
line-height: inherit;
|
|
||||||
border-radius: inherit;
|
|
||||||
}
|
|
||||||
.bootstrap-select.form-control-sm .dropdown-toggle {
|
|
||||||
padding: 0.25rem 0.5rem;
|
|
||||||
}
|
|
||||||
.bootstrap-select.form-control-lg .dropdown-toggle {
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
}
|
|
||||||
.form-inline .bootstrap-select .form-control {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.bootstrap-select.disabled,
|
|
||||||
.bootstrap-select > .disabled {
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
.bootstrap-select.disabled:focus,
|
|
||||||
.bootstrap-select > .disabled:focus {
|
|
||||||
outline: none !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select.bs-container {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
height: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select.bs-container .dropdown-menu {
|
|
||||||
z-index: 1060;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-toggle .filter-option {
|
|
||||||
position: static;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
float: left;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
text-align: left;
|
|
||||||
overflow: hidden;
|
|
||||||
-webkit-box-flex: 0;
|
|
||||||
-webkit-flex: 0 1 auto;
|
|
||||||
-ms-flex: 0 1 auto;
|
|
||||||
flex: 0 1 auto;
|
|
||||||
}
|
|
||||||
.bs3.bootstrap-select .dropdown-toggle .filter-option {
|
|
||||||
padding-right: inherit;
|
|
||||||
}
|
|
||||||
.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option {
|
|
||||||
position: absolute;
|
|
||||||
padding-top: inherit;
|
|
||||||
padding-bottom: inherit;
|
|
||||||
padding-left: inherit;
|
|
||||||
float: none;
|
|
||||||
}
|
|
||||||
.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner {
|
|
||||||
padding-right: inherit;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-toggle .filter-option-inner-inner {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-toggle .filter-expand {
|
|
||||||
width: 0 !important;
|
|
||||||
float: left;
|
|
||||||
opacity: 0 !important;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-toggle .caret {
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
right: 12px;
|
|
||||||
margin-top: -2px;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
.input-group .bootstrap-select.form-control .dropdown-toggle {
|
|
||||||
border-radius: inherit;
|
|
||||||
}
|
|
||||||
.bootstrap-select[class*="col-"] .dropdown-toggle {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu {
|
|
||||||
min-width: 100%;
|
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu > .inner:focus {
|
|
||||||
outline: none !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu.inner {
|
|
||||||
position: static;
|
|
||||||
float: none;
|
|
||||||
border: 0;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
border-radius: 0;
|
|
||||||
-webkit-box-shadow: none;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li.active small {
|
|
||||||
color: rgba(255, 255, 255, 0.5) !important;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li.disabled a {
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li a {
|
|
||||||
cursor: pointer;
|
|
||||||
-webkit-user-select: none;
|
|
||||||
-moz-user-select: none;
|
|
||||||
-ms-user-select: none;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li a.opt {
|
|
||||||
position: relative;
|
|
||||||
padding-left: 2.25em;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li a span.check-mark {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li a span.text {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu li small {
|
|
||||||
padding-left: 0.5em;
|
|
||||||
}
|
|
||||||
.bootstrap-select .dropdown-menu .notify {
|
|
||||||
position: absolute;
|
|
||||||
bottom: 5px;
|
|
||||||
width: 96%;
|
|
||||||
margin: 0 2%;
|
|
||||||
min-height: 26px;
|
|
||||||
padding: 3px 5px;
|
|
||||||
background: #f5f5f5;
|
|
||||||
border: 1px solid #e3e3e3;
|
|
||||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
|
|
||||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
|
|
||||||
pointer-events: none;
|
|
||||||
opacity: 0.9;
|
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
.bootstrap-select .no-results {
|
|
||||||
padding: 3px;
|
|
||||||
background: #f5f5f5;
|
|
||||||
margin: 0 5px;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
.bootstrap-select.fit-width .dropdown-toggle .filter-option {
|
|
||||||
position: static;
|
|
||||||
display: inline;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,
|
|
||||||
.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner {
|
|
||||||
display: inline;
|
|
||||||
}
|
|
||||||
.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before {
|
|
||||||
content: '\00a0';
|
|
||||||
}
|
|
||||||
.bootstrap-select.fit-width .dropdown-toggle .caret {
|
|
||||||
position: static;
|
|
||||||
top: auto;
|
|
||||||
margin-top: -1px;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark {
|
|
||||||
position: absolute;
|
|
||||||
display: inline-block;
|
|
||||||
right: 15px;
|
|
||||||
top: 5px;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-tick .dropdown-menu li a span.text {
|
|
||||||
margin-right: 34px;
|
|
||||||
}
|
|
||||||
.bootstrap-select .bs-ok-default:after {
|
|
||||||
content: '';
|
|
||||||
display: block;
|
|
||||||
width: 0.5em;
|
|
||||||
height: 1em;
|
|
||||||
border-style: solid;
|
|
||||||
border-width: 0 0.26em 0.26em 0;
|
|
||||||
-webkit-transform: rotate(45deg);
|
|
||||||
-ms-transform: rotate(45deg);
|
|
||||||
-o-transform: rotate(45deg);
|
|
||||||
transform: rotate(45deg);
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.open > .dropdown-toggle,
|
|
||||||
.bootstrap-select.show-menu-arrow.show > .dropdown-toggle {
|
|
||||||
z-index: 1061;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before {
|
|
||||||
content: '';
|
|
||||||
border-left: 7px solid transparent;
|
|
||||||
border-right: 7px solid transparent;
|
|
||||||
border-bottom: 7px solid rgba(204, 204, 204, 0.2);
|
|
||||||
position: absolute;
|
|
||||||
bottom: -4px;
|
|
||||||
left: 9px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after {
|
|
||||||
content: '';
|
|
||||||
border-left: 6px solid transparent;
|
|
||||||
border-right: 6px solid transparent;
|
|
||||||
border-bottom: 6px solid white;
|
|
||||||
position: absolute;
|
|
||||||
bottom: -4px;
|
|
||||||
left: 10px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before {
|
|
||||||
bottom: auto;
|
|
||||||
top: -4px;
|
|
||||||
border-top: 7px solid rgba(204, 204, 204, 0.2);
|
|
||||||
border-bottom: 0;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after {
|
|
||||||
bottom: auto;
|
|
||||||
top: -4px;
|
|
||||||
border-top: 6px solid white;
|
|
||||||
border-bottom: 0;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before {
|
|
||||||
right: 12px;
|
|
||||||
left: auto;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after {
|
|
||||||
right: 13px;
|
|
||||||
left: auto;
|
|
||||||
}
|
|
||||||
.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before,
|
|
||||||
.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before,
|
|
||||||
.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after,
|
|
||||||
.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.bs-searchbox,
|
|
||||||
.bs-actionsbox,
|
|
||||||
.bs-donebutton {
|
|
||||||
padding: 4px 8px;
|
|
||||||
}
|
|
||||||
.bs-actionsbox {
|
|
||||||
width: 100%;
|
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
.bs-actionsbox .btn-group button {
|
|
||||||
width: 50%;
|
|
||||||
}
|
|
||||||
.bs-donebutton {
|
|
||||||
float: left;
|
|
||||||
width: 100%;
|
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
.bs-donebutton .btn-group button {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.bs-searchbox + .bs-actionsbox {
|
|
||||||
padding: 0 8px 4px;
|
|
||||||
}
|
|
||||||
.bs-searchbox .form-control {
|
|
||||||
margin-bottom: 0;
|
|
||||||
width: 100%;
|
|
||||||
float: none;
|
|
||||||
}
|
|
||||||
/*# sourceMappingURL=bootstrap-select.css.map */
|
|
||||||
-3139
File diff suppressed because it is too large.
Load diff
Vendored
-6
@@ -1,6 +0,0 @@
|
|||||||
/*!
|
|
||||||
* Bootstrap-select v1.13.10 (https://developer.snapappointments.com/bootstrap-select)
|
|
||||||
*
|
|
||||||
* Copyright 2012-2019 SnapAppointments, LLC
|
|
||||||
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
|
|
||||||
*/.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disablLine truncated
|
|
||||||
Vendored
-9
@@ -1,9 +0,0 @@
|
|||||||
/*!
|
|
||||||
* Bootstrap-select v1.13.10 (https://developer.snapappointments.com/bootstrap-select)
|
|
||||||
*
|
|
||||||
* Copyright 2012-2019 SnapAppointments, LLC
|
|
||||||
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
|
|
||||||
*/
|
|
||||||
|
|
||||||
!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){!function(z){"use strict";var d=["sanitize","whiteList","sanitizeFn"],r=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],e={"*":["class","dir","id","lang","role","tabindex","style",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},l=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,a=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function v(e,t){var i=e.nodeName.toLowerCase();if(-1!==z.inArray(i,t))return-1===z.inArray(i,r)||Boolean(e.nodeValue.match(l)||e.nodeValue.match(a));for(var s=z(t).filter(function(e,t){return t instanceof RegExp}),n=0,o=s.length;n<o;n++)if(i.match(s[n]))return!0;return!1}function P(e,t,i){if(i&&"function"==typeof i)return i(e);for(var s=Object.keys(t),n=0,o=e.length;n<o;n++)for(var r=e[n].querySelectorAll("*"),l=0,a=r.length;l<a;l++){var c=r[l],d=c.nodeName.toLowerCase();if(-1!==s.indexOf(d))for(var h=[].slice.call(c.attributes),p=[].concat(t["*"]||[],t[d]||[]),u=0,f=h.length;u<f;u++){var m=h[u];v(m,p)||c.removeAttribute(m.nodeName)}else c.parentNode.removeChild(c)}}"classList"in document.createElement("_")||function(e){if("Element"in e){var t="classList",i="prototype",s=e.Element[i],n=Object,o=function(){var i=z(this);return{add:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.addClass(e)},remove:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.removeClass(e)},toggle:function(e,t){return i.toggleClass(e,t)},contains:function(e){return i.hasClass(e)}}};if(n.defineProperty){var r={get:o,enumerable:!0,configurable:!0};try{n.defineProperty(s,t,r)}catch(e){void 0!==e.number&&-2146823252!==e.number||(r.enumerable=!1,n.defineProperty(s,t,r))}}else n[i].__defineGetter__&&s.__defineGetter__(t,o)}}(window);var t,c,i,s=document.createElement("_");if(s.classList.add("c1","c2"),!s.classList.contains("c2")){var n=DOMTokenList.prototype.add,o=DOMTokenList.prototype.remove;DOMTokenList.prototype.add=function(){Array.prototype.forEach.call(arguments,n.bind(this))},DOMTokenList.prototype.remove=function(){Array.prototype.forEach.call(arguments,o.bind(this))}}if(s.classList.toggle("c3",!1),s.classList.contains("c3")){var h=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:h.call(this,e)}}function O(e,t){for(var i,s=[],n=t||e.selectedOptions,o=0,r=n.length;o<r;o++)(i=n[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||s.push(i.value||i.text);return e.multiple?s:s.length?s[0]:null}s=null,String.prototype.startsWith||(t=function(){try{var e={},t=Object.defineProperty,i=t(e,e,e)&&t}catch(e){}return i}(),c={}.toString,i=function(e){if(null==this)throw new TypeError;var t=String(this);if(e&&"[object RegExp]"==c.call(e))throw new TypeError;var i=t.length,s=String(e),n=s.length,o=1<arguments.length?arguments[1]:void 0,r=o?Number(o):0;r!=r&&(r=0);var l=Math.min(Math.max(r,0),i);if(i<n+l)return!1;for(var a=-1;++a<n;)if(t.charCodeAt(l+a)!=s.charCodeAt(a))return!1;return!0},t?t(String.prototype,"startsWith",{value:i,configurable:!0,writable:!0}):String.prototype.startsWith=i),Object.keys||(Object.keys=function(e,t,i){for(t in i=[],e)i.hasOwnProperty.call(e,t)&&i.push(t);return i}),HTMLSelectElement&&!HTMLSelectElement.prototype.hasOwnProperty("selectedOptions")&&Object.defineProperty(HTMLSelectElement.prototype,"selectedOptions",{get:function(){return this.querySelectorAll(":checked")}});var p={useDefault:!1,_set:z.valHooks.select.set};z.valHooks.select.set=function(e,t){return t&&!p.useDefault&&z(e).data("selected",!0),p._set.apply(this,arguments)};var T=null,u=function(){try{return new Event("change"),!0}catch(e){return!1}}();function k(e,t,i,s){for(var n=["display","subtext","tokens"],o=!1,r=0;r<n.length;r++){var l=n[r],a=e[l];if(a&&(a=a.toString(),"display"===l&&(a=a.replace(/<[^>]+>/g,"")),s&&(a=w(a)),a=a.toUpperCase(),o="contains"===i?0<=a.indexOf(t):a.startsWith(t)))break}return o}function A(e){return parseInt(e,10)||0}z.fn.triggerNative=function(e){var t,i=this[0];i.dispatchEvent?(u?t=new Event(e,{bubbles:!0}):(t=document.createEvent("Event")).initEvent(e,!0,!1),i.dispatchEvent(t)):i.fireEvent?((t=document.createEventObject()).eventType=e,i.fireEvent("on"+e,t)):this.trigger(e)};var f={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":Line truncated
|
|
||||||
//# sourceMappingURL=bootstrap-select.min.js.map
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author zhixin wen <wenzhixin2010@gmail.com>
|
|
||||||
* version: 1.18.3
|
|
||||||
* https://github.com/wenzhixin/bootstrap-table/
|
|
||||||
*/
|
|
||||||
.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==")}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII= ")}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;width:auto!important;text-align:left!important}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-value{width:100%!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-tableLine truncated
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author zhixin wen <wenzhixin2010@gmail.com>
|
|
||||||
* version: 1.18.3
|
|
||||||
* https://github.com/wenzhixin/bootstrap-table/
|
|
||||||
*/
|
|
||||||
function getRememberRowIds(a,b){return $.isArray(a)?props=$.map(a,function(c){return c[b]}):props=[a[b]],props}function addRememberRow(b,c){var a=null==table.options.uniqueId?table.options.columns[1].field:table.options.uniqueId,d=getRememberRowIds(b,a);-1==$.inArray(c[a],d)&&(b[b.length]=c)}function removeRememberRow(b,c){var a=null==table.options.uniqueId?table.options.columns[1].field:table.options.uniqueId,f=getRememberRowIds(b,a),d=$.inArray(c[a],f);-1!=d&&b.splice(d,1)}!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],b):(a="undefined"!=typeof globalThis?globalThis:a||self,a.BootstrapTable=b(a.jQuery))}(this,function(fl){function fK(a){return a&&"object"==typeof a&&"default" in a?a:{"default":a}}function fD(a){return(fD="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(b){return typeof b}:function(b){return b&&"function"==typeof Symbol&&b.constructor===Symbol&&b!==Symbol.prototype?"symbol":typeof b})(a)}function fw(a,b){if(!(a instanceof b)){throw new TypeError("Cannot call a class as a function")}}function fu(b,c){for(var a=0;a<c.length;a++){var d=c[a];d.enumerable=d.enumerable||!1,d.configurable=!0,"value" in d&&(d.writable=!0),Object.defineProperty(b,d.key,d)}}function fQ(b,c,a){return c&&fu(b.prototype,c),a&&fu(b,a),b}function fm(a,b){return fM(a)||fh(a,b)||fL(a,b)||fG()}function fp(a){return fz(a)||fF(a)||fL(a)||fr()}function fz(a){return Array.isArray(a)?fI(a):void 0}function fM(a){return Array.isArray(a)?a:void 0}function fF(a){return"undefined"!=typeof Symbol&&Symbol.iterator in Object(a)?Array.from(a):void 0}function fh(k,h){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(k)){var g=[],d=!0,c=!1,j=void 0;try{for(var m,b=k[Symbol.iterator]();!(d=(m=b.next()).done)&&(g.push(m.value),!h||g.length!==h);d=!0){}}catch(f){c=!0,j=f}finally{try{d||null==b["return"]||b["return"]()}finally{if(c){throw j}}}return g}}function fL(b,c){if(b){if("string"==typeof b){return fI(b,c)}var a=Object.prototype.toString.call(b).slice(8,-1);return"Object"===a&&b.constructor&&(a=b.constructor.name),"Map"===a||"Set"===a?Array.from(b):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?fI(b,c):void 0}}function fI(b,c){(null==c||c>b.length)&&(c=b.length);for(var a=0,d=Array(c);c>a;a++){d[a]=b[a]}return d}function fr(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function fG(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function fg(d,h){var c;if("undefined"==typeof Symbol||null==d[Symbol.iterator]){if(Array.isArray(d)||(c=fL(d))||h&&d&&"number"==typeof d.length){c&&(d=c);var k=0,j=function(){};return{s:j,n:function(){return k>=d.length?{done:!0}:{done:!1,value:d[k++]}},e:function(a){throw a},f:j}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,f=!0,g=!1;return{s:function(){c=d[Symbol.iterator]()},n:function(){var a=c.next();return f=a.done,a},e:function(a){g=!0,b=a},f:function(){try{f||null==c["return"]||c["return"]()}finally{if(g){throw b}}}}}function fO(a,b){return b={exports:{}},a(b,b.exports),b.exports}function fx(a,b){return RegExp(a,b)}var fc=fK(fl),ff="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},f2=function(a){return a&&a.Math==Math&&a},fd=f2("object"==typeof globalThis&&globalThis)||f2("object"==typeof window&&window)||f2("object"==typeof self&&self)||f2("object"==typeof ff&&ff)||function(){return this}()||Function("return this")(),fA=function(a){try{return !!a()}catch(b){return !0}},f8=!fA(function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}),f1={}.propertyIsEnumerable,gw=Object.getOwnPropertyDescriptor,f6=gw&&!f1.call({1:2},1),gk=f6?function(a){var b=gw(this,a);return !!b&&b.enumerable}:f1,gz={f:gk},gS=function(a,b){return{enumerable:!(1&a),configurable:!(2&a),writable:!(4&a),value:b}},f3={}.toString,gs=function(a){return f3.call(a).slice(8,-1)},fB="".split,fR=fA(function(){return !Object("z").propertyIsEnumerable(0)})?function(a){return"String"==gs(a)?fB.call(a,""):Object(a)}:Object,f9=function(a){if(void 0==a){throw TypeError("Can't call method on "+a)}return a},gr=function(a){return fR(f9(a))},gu=function(a){return"object"==typeof a?null!==a:"function"==typeof a},fY=function(b,c){if(!gu(b)){return b}var a,d;if(c&&"function"==typeof(a=b.toString)&&!gu(d=a.call(b))){return d}if("function"==typeof(a=b.valueOf)&&!gu(d=a.call(b))){return d}if(!c&&"function"==typeof(a=b.toString)&&!gu(d=a.call(b))){return d}throw TypeError("Can't convert object to primitive value")},gy={}.hasOwnProperty,gd=function(a,b){reLine truncated
|
|
||||||
-93
@@ -1,93 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author: Alec Fenichel
|
|
||||||
* @webSite: https://fenichelar.com
|
|
||||||
* @update: zhixin wen <wenzhixin2010@gmail.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
const Utils = $.fn.bootstrapTable.utils
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.defaults, {
|
|
||||||
autoRefresh: false,
|
|
||||||
autoRefreshInterval: 60,
|
|
||||||
autoRefreshSilent: true,
|
|
||||||
autoRefreshStatus: true,
|
|
||||||
autoRefreshFunction: null
|
|
||||||
})
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.defaults.icons, {
|
|
||||||
autoRefresh: {
|
|
||||||
bootstrap3: 'glyphicon-time icon-time',
|
|
||||||
materialize: 'access_time',
|
|
||||||
'bootstrap-table': 'icon-clock'
|
|
||||||
}[$.fn.bootstrapTable.theme] || 'fa-clock'
|
|
||||||
})
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.locales, {
|
|
||||||
formatAutoRefresh () {
|
|
||||||
return 'Auto Refresh'
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales)
|
|
||||||
|
|
||||||
$.BootstrapTable = class extends $.BootstrapTable {
|
|
||||||
init (...args) {
|
|
||||||
super.init(...args)
|
|
||||||
|
|
||||||
if (this.options.autoRefresh && this.options.autoRefreshStatus) {
|
|
||||||
this.setupRefreshInterval()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
initToolbar (...args) {
|
|
||||||
if (this.options.autoRefresh) {
|
|
||||||
this.buttons = Object.assign(this.buttons, {
|
|
||||||
autoRefresh: {
|
|
||||||
html: `
|
|
||||||
<button class="auto-refresh ${this.constants.buttonsClass}
|
|
||||||
${this.options.autoRefreshStatus ? ` ${this.constants.classes.buttonActive}` : ''}"
|
|
||||||
type="button" name="autoRefresh" title="${this.options.formatAutoRefresh()}">
|
|
||||||
${ this.options.showButtonIcons ? Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.autoRefresh) : ''}
|
|
||||||
${ this.options.showButtonText ? this.options.formatAutoRefresh() : ''}
|
|
||||||
</button>
|
|
||||||
`,
|
|
||||||
event: this.toggleAutoRefresh
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
super.initToolbar(...args)
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleAutoRefresh () {
|
|
||||||
if (this.options.autoRefresh) {
|
|
||||||
if (this.options.autoRefreshStatus) {
|
|
||||||
clearInterval(this.options.autoRefreshFunction)
|
|
||||||
this.$toolbar.find('>.columns .auto-refresh')
|
|
||||||
.removeClass(this.constants.classes.buttonActive)
|
|
||||||
} else {
|
|
||||||
this.setupRefreshInterval()
|
|
||||||
this.$toolbar.find('>.columns .auto-refresh')
|
|
||||||
.addClass(this.constants.classes.buttonActive)
|
|
||||||
}
|
|
||||||
this.options.autoRefreshStatus = !this.options.autoRefreshStatus
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
destroy () {
|
|
||||||
if (this.options.autoRefresh && this.options.autoRefreshStatus) {
|
|
||||||
clearInterval(this.options.autoRefreshFunction)
|
|
||||||
}
|
|
||||||
|
|
||||||
super.destroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
setupRefreshInterval () {
|
|
||||||
this.options.autoRefreshFunction = setInterval(() => {
|
|
||||||
if (!this.options.autoRefresh || !this.options.autoRefreshStatus) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.refresh({ silent: this.options.autoRefreshSilent })
|
|
||||||
}, this.options.autoRefreshInterval * 1000)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-404
@@ -1,404 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author zhixin wen <wenzhixin2010@gmail.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
const Utils = $.fn.bootstrapTable.utils
|
|
||||||
|
|
||||||
// Reasonable defaults
|
|
||||||
const PIXEL_STEP = 10
|
|
||||||
const LINE_HEIGHT = 40
|
|
||||||
const PAGE_HEIGHT = 800
|
|
||||||
|
|
||||||
function normalizeWheel (event) {
|
|
||||||
let sX = 0 // spinX
|
|
||||||
let sY = 0 // spinY
|
|
||||||
let pX = 0 // pixelX
|
|
||||||
let pY = 0 // pixelY
|
|
||||||
|
|
||||||
// Legacy
|
|
||||||
if ('detail' in event) { sY = event.detail }
|
|
||||||
if ('wheelDelta' in event) { sY = -event.wheelDelta / 120 }
|
|
||||||
if ('wheelDeltaY' in event) { sY = -event.wheelDeltaY / 120 }
|
|
||||||
if ('wheelDeltaX' in event) { sX = -event.wheelDeltaX / 120 }
|
|
||||||
|
|
||||||
// side scrolling on FF with DOMMouseScroll
|
|
||||||
if ('axis' in event && event.axis === event.HORIZONTAL_AXIS) {
|
|
||||||
sX = sY
|
|
||||||
sY = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
pX = sX * PIXEL_STEP
|
|
||||||
pY = sY * PIXEL_STEP
|
|
||||||
|
|
||||||
if ('deltaY' in event) { pY = event.deltaY }
|
|
||||||
if ('deltaX' in event) { pX = event.deltaX }
|
|
||||||
|
|
||||||
if ((pX || pY) && event.deltaMode) {
|
|
||||||
if (event.deltaMode === 1) { // delta in LINE units
|
|
||||||
pX *= LINE_HEIGHT
|
|
||||||
pY *= LINE_HEIGHT
|
|
||||||
} else { // delta in PAGE units
|
|
||||||
pX *= PAGE_HEIGHT
|
|
||||||
pY *= PAGE_HEIGHT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall-back if spin cannot be determined
|
|
||||||
if (pX && !sX) { sX = (pX < 1) ? -1 : 1 }
|
|
||||||
if (pY && !sY) { sY = (pY < 1) ? -1 : 1 }
|
|
||||||
|
|
||||||
return {
|
|
||||||
spinX: sX,
|
|
||||||
spinY: sY,
|
|
||||||
pixelX: pX,
|
|
||||||
pixelY: pY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.defaults, {
|
|
||||||
fixedColumns: false,
|
|
||||||
fixedNumber: 0,
|
|
||||||
fixedRightNumber: 0
|
|
||||||
})
|
|
||||||
|
|
||||||
$.BootstrapTable = class extends $.BootstrapTable {
|
|
||||||
|
|
||||||
fixedColumnsSupported () {
|
|
||||||
return this.options.fixedColumns &&
|
|
||||||
!this.options.detailView &&
|
|
||||||
!this.options.cardView
|
|
||||||
}
|
|
||||||
|
|
||||||
initContainer () {
|
|
||||||
super.initContainer()
|
|
||||||
|
|
||||||
if (!this.fixedColumnsSupported()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.options.fixedNumber) {
|
|
||||||
this.$tableContainer.append('<div class="fixed-columns"></div>')
|
|
||||||
this.$fixedColumns = this.$tableContainer.find('.fixed-columns')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.options.fixedRightNumber) {
|
|
||||||
this.$tableContainer.append('<div class="fixed-columns-right"></div>')
|
|
||||||
this.$fixedColumnsRight = this.$tableContainer.find('.fixed-columns-right')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
initBody (...args) {
|
|
||||||
super.initBody(...args)
|
|
||||||
|
|
||||||
if (this.$fixedColumns && this.$fixedColumns.length) {
|
|
||||||
this.$fixedColumns.toggle(this.fixedColumnsSupported())
|
|
||||||
}
|
|
||||||
if (this.$fixedColumnsRight && this.$fixedColumnsRight.length) {
|
|
||||||
this.$fixedColumnsRight.toggle(this.fixedColumnsSupported())
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.fixedColumnsSupported()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.options.showHeader && this.options.height) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.initFixedColumnsBody()
|
|
||||||
this.initFixedColumnsEvents()
|
|
||||||
}
|
|
||||||
|
|
||||||
trigger (...args) {
|
|
||||||
super.trigger(...args)
|
|
||||||
|
|
||||||
if (!this.fixedColumnsSupported()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args[0] === 'post-header') {
|
|
||||||
this.initFixedColumnsHeader()
|
|
||||||
} else if (args[0] === 'scroll-body') {
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedBody.scrollTop(this.$tableBody.scrollTop())
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
updateSelected () {
|
|
||||||
super.updateSelected()
|
|
||||||
|
|
||||||
if (!this.fixedColumnsSupported()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$tableBody.find('tr').each((i, el) => {
|
|
||||||
const $el = $(el)
|
|
||||||
const index = $el.data('index')
|
|
||||||
const classes = $el.attr('class')
|
|
||||||
|
|
||||||
const inputSelector = `[name="${this.options.selectItemName}"]`
|
|
||||||
const $input = $el.find(inputSelector)
|
|
||||||
|
|
||||||
if (typeof index === undefined) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateFixedBody = ($fixedHeader, $fixedBody) => {
|
|
||||||
const $tr = $fixedBody.find(`tr[data-index="${index}"]`)
|
|
||||||
|
|
||||||
$tr.attr('class', classes)
|
|
||||||
|
|
||||||
if ($input.length) {
|
|
||||||
$tr.find(inputSelector).prop('checked', $input.prop('checked'))
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$selectAll.length) {
|
|
||||||
$fixedHeader.add($fixedBody)
|
|
||||||
.find('[name="btSelectAll"]')
|
|
||||||
.prop('checked', this.$selectAll.prop('checked'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$fixedBody && this.options.fixedNumber) {
|
|
||||||
updateFixedBody(this.$fixedHeader, this.$fixedBody)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$fixedBodyRight && this.options.fixedRightNumber) {
|
|
||||||
updateFixedBody(this.$fixedHeaderRight, this.$fixedBodyRight)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
hideLoading () {
|
|
||||||
super.hideLoading()
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedColumns.find('.fixed-table-loading').hide()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
this.$fixedColumnsRight.find('.fixed-table-loading').hide()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
initFixedColumnsHeader () {
|
|
||||||
if (this.options.height) {
|
|
||||||
this.needFixedColumns = this.$tableHeader.outerWidth(true) < this.$tableHeader.find('table').outerWidth(true)
|
|
||||||
} else {
|
|
||||||
this.needFixedColumns = this.$tableBody.outerWidth(true) < this.$tableBody.find('table').outerWidth(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
const initFixedHeader = ($fixedColumns, isRight) => {
|
|
||||||
$fixedColumns.find('.fixed-table-header').remove()
|
|
||||||
$fixedColumns.append(this.$tableHeader.clone(true))
|
|
||||||
|
|
||||||
$fixedColumns.css({
|
|
||||||
width: this.getFixedColumnsWidth(isRight)
|
|
||||||
})
|
|
||||||
return $fixedColumns.find('.fixed-table-header')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedHeader = initFixedHeader(this.$fixedColumns)
|
|
||||||
this.$fixedHeader.css('margin-right', '')
|
|
||||||
} else if (this.$fixedColumns) {
|
|
||||||
this.$fixedColumns.html('').css('width', '')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
this.$fixedHeaderRight = initFixedHeader(this.$fixedColumnsRight, true)
|
|
||||||
this.$fixedHeaderRight.scrollLeft(this.$fixedHeaderRight.find('table').width())
|
|
||||||
} else if (this.$fixedColumnsRight) {
|
|
||||||
this.$fixedColumnsRight.html('').css('width', '')
|
|
||||||
}
|
|
||||||
|
|
||||||
this.initFixedColumnsBody()
|
|
||||||
this.initFixedColumnsEvents()
|
|
||||||
}
|
|
||||||
|
|
||||||
initFixedColumnsBody () {
|
|
||||||
const initFixedBody = ($fixedColumns, $fixedHeader) => {
|
|
||||||
$fixedColumns.find('.fixed-table-body').remove()
|
|
||||||
$fixedColumns.append(this.$tableBody.clone(true))
|
|
||||||
|
|
||||||
const $fixedBody = $fixedColumns.find('.fixed-table-body')
|
|
||||||
|
|
||||||
const tableBody = this.$tableBody.get(0)
|
|
||||||
const scrollHeight = tableBody.scrollWidth > tableBody.clientWidth ?
|
|
||||||
Utils.getScrollBarWidth() : 0
|
|
||||||
const height = this.$tableContainer.outerHeight(true) - scrollHeight - 1
|
|
||||||
|
|
||||||
$fixedColumns.css({
|
|
||||||
height
|
|
||||||
})
|
|
||||||
|
|
||||||
$fixedBody.css({
|
|
||||||
height: height - $fixedHeader.height()
|
|
||||||
})
|
|
||||||
|
|
||||||
return $fixedBody
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedBody = initFixedBody(this.$fixedColumns, this.$fixedHeader)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
this.$fixedBodyRight = initFixedBody(this.$fixedColumnsRight, this.$fixedHeaderRight)
|
|
||||||
this.$fixedBodyRight.scrollLeft(this.$fixedBodyRight.find('table').width())
|
|
||||||
this.$fixedBodyRight.css('overflow-y', this.options.height ? 'auto' : 'hidden')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getFixedColumnsWidth (isRight) {
|
|
||||||
let visibleFields = this.getVisibleFields()
|
|
||||||
let width = 0
|
|
||||||
let fixedNumber = this.options.fixedNumber
|
|
||||||
let marginRight = 0
|
|
||||||
|
|
||||||
if (isRight) {
|
|
||||||
visibleFields = visibleFields.reverse()
|
|
||||||
fixedNumber = this.options.fixedRightNumber
|
|
||||||
marginRight = parseInt(this.$tableHeader.css('margin-right'), 10)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < fixedNumber; i++) {
|
|
||||||
width += this.$header.find(`th[data-field="${visibleFields[i]}"]`).outerWidth(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
return width + marginRight + 1
|
|
||||||
}
|
|
||||||
|
|
||||||
initFixedColumnsEvents () {
|
|
||||||
const toggleHover = (e, toggle) => {
|
|
||||||
const tr = `tr[data-index="${$(e.currentTarget).data('index')}"]`
|
|
||||||
let $trs = this.$tableBody.find(tr)
|
|
||||||
|
|
||||||
if (this.$fixedBody) {
|
|
||||||
$trs = $trs.add(this.$fixedBody.find(tr))
|
|
||||||
}
|
|
||||||
if (this.$fixedBodyRight) {
|
|
||||||
$trs = $trs.add(this.$fixedBodyRight.find(tr))
|
|
||||||
}
|
|
||||||
|
|
||||||
$trs.css('background-color', toggle ? $(e.currentTarget).css('background-color') : '')
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$tableBody.find('tr').hover(e => {
|
|
||||||
toggleHover(e, true)
|
|
||||||
}, e => {
|
|
||||||
toggleHover(e, false)
|
|
||||||
})
|
|
||||||
|
|
||||||
const isFirefox = typeof navigator !== 'undefined' &&
|
|
||||||
navigator.userAgent.toLowerCase().indexOf('firefox') > -1
|
|
||||||
const mousewheel = isFirefox ? 'DOMMouseScroll' : 'mousewheel'
|
|
||||||
const updateScroll = (e, fixedBody) => {
|
|
||||||
const normalized = normalizeWheel(e)
|
|
||||||
const deltaY = Math.ceil(normalized.pixelY)
|
|
||||||
const top = this.$tableBody.scrollTop() + deltaY
|
|
||||||
|
|
||||||
if (
|
|
||||||
deltaY < 0 && top > 0 ||
|
|
||||||
deltaY > 0 && top < fixedBody.scrollHeight - fixedBody.clientHeight
|
|
||||||
) {
|
|
||||||
e.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$tableBody.scrollTop(top)
|
|
||||||
if (this.$fixedBody) {
|
|
||||||
this.$fixedBody.scrollTop(top)
|
|
||||||
}
|
|
||||||
if (this.$fixedBodyRight) {
|
|
||||||
this.$fixedBodyRight.scrollTop(top)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedBody.find('tr').hover(e => {
|
|
||||||
toggleHover(e, true)
|
|
||||||
}, e => {
|
|
||||||
toggleHover(e, false)
|
|
||||||
})
|
|
||||||
|
|
||||||
this.$fixedBody[0].addEventListener(mousewheel, e => {
|
|
||||||
updateScroll(e, this.$fixedBody[0])
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
this.$fixedBodyRight.find('tr').hover(e => {
|
|
||||||
toggleHover(e, true)
|
|
||||||
}, e => {
|
|
||||||
toggleHover(e, false)
|
|
||||||
})
|
|
||||||
|
|
||||||
this.$fixedBodyRight.off('scroll').on('scroll', () => {
|
|
||||||
const top = this.$fixedBodyRight.scrollTop()
|
|
||||||
|
|
||||||
this.$tableBody.scrollTop(top)
|
|
||||||
if (this.$fixedBody) {
|
|
||||||
this.$fixedBody.scrollTop(top)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.options.filterControl) {
|
|
||||||
$(this.$fixedColumns).off('keyup change').on('keyup change', e => {
|
|
||||||
const $target = $(e.target)
|
|
||||||
const value = $target.val()
|
|
||||||
const field = $target.parents('th').data('field')
|
|
||||||
const $coreTh = this.$header.find(`th[data-field="${field}"]`)
|
|
||||||
|
|
||||||
if ($target.is('input')) {
|
|
||||||
$coreTh.find('input').val(value)
|
|
||||||
} else if ($target.is('select')) {
|
|
||||||
const $select = $coreTh.find('select')
|
|
||||||
|
|
||||||
$select.find('option[selected]').removeAttr('selected')
|
|
||||||
$select.find(`option[value="${value}"]`).attr('selected', true)
|
|
||||||
}
|
|
||||||
|
|
||||||
this.triggerSearch()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
renderStickyHeader () {
|
|
||||||
if (!this.options.stickyHeader) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$stickyContainer = this.$container.find('.sticky-header-container')
|
|
||||||
super.renderStickyHeader()
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedNumber) {
|
|
||||||
this.$fixedColumns.css('z-index', 101)
|
|
||||||
.find('.sticky-header-container')
|
|
||||||
.css('right', '')
|
|
||||||
.width(this.$fixedColumns.outerWidth())
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.needFixedColumns && this.options.fixedRightNumber) {
|
|
||||||
const $stickyHeaderContainerRight = this.$fixedColumnsRight.find('.sticky-header-container')
|
|
||||||
|
|
||||||
this.$fixedColumnsRight.css('z-index', 101)
|
|
||||||
$stickyHeaderContainerRight.css('left', '')
|
|
||||||
.scrollLeft($stickyHeaderContainerRight.find('.table').outerWidth())
|
|
||||||
.width(this.$fixedColumnsRight.outerWidth())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
matchPositionX () {
|
|
||||||
if (!this.options.stickyHeader) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$stickyContainer.eq(0).scrollLeft(this.$tableBody.scrollLeft())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-663
@@ -1,663 +0,0 @@
|
|||||||
/*! X-editable - v1.5.1
|
|
||||||
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
|
|
||||||
* http://github.com/vitalets/x-editable
|
|
||||||
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
|
|
||||||
.editableform {
|
|
||||||
margin-bottom: 0; /* overwrites bootstrap margin */
|
|
||||||
}
|
|
||||||
|
|
||||||
.editableform .control-group {
|
|
||||||
margin-bottom: 0; /* overwrites bootstrap margin */
|
|
||||||
white-space: nowrap; /* prevent wrapping buttons on new line */
|
|
||||||
line-height: 20px; /* overwriting bootstrap line-height. See #133 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
BS3 width:1005 for inputs breaks editable form in popup
|
|
||||||
See: https://github.com/vitalets/x-editable/issues/393
|
|
||||||
*/
|
|
||||||
.editableform .form-control {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-buttons {
|
|
||||||
display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
|
|
||||||
vertical-align: top;
|
|
||||||
margin-left: 7px;
|
|
||||||
/* inline-block emulation for IE7*/
|
|
||||||
zoom: 1;
|
|
||||||
*display: inline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-buttons.editable-buttons-bottom {
|
|
||||||
display: block;
|
|
||||||
margin-top: 7px;
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-input {
|
|
||||||
vertical-align: top;
|
|
||||||
display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
|
|
||||||
width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
|
|
||||||
white-space: normal; /* reset white-space decalred in parent*/
|
|
||||||
/* display-inline emulation for IE7*/
|
|
||||||
zoom: 1;
|
|
||||||
*display: inline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-buttons .editable-cancel {
|
|
||||||
margin-left: 7px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*for jquery-ui buttons need set height to look more pretty*/
|
|
||||||
.editable-buttons button.ui-button-icon-only {
|
|
||||||
height: 24px;
|
|
||||||
width: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editableform-loading {
|
|
||||||
background: url('loading.gif') center center no-repeat;
|
|
||||||
height: 25px;
|
|
||||||
width: auto;
|
|
||||||
min-width: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-inline .editableform-loading {
|
|
||||||
background-position: left 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-error-block {
|
|
||||||
max-width: 300px;
|
|
||||||
margin: 5px 0 0 0;
|
|
||||||
width: auto;
|
|
||||||
white-space: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*add padding for jquery ui*/
|
|
||||||
.editable-error-block.ui-state-error {
|
|
||||||
padding: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-error {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---- For specific types ---- */
|
|
||||||
|
|
||||||
.editableform .editable-date {
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
|
|
||||||
.editable-inline .add-on .icon-th {
|
|
||||||
margin-top: 3px;
|
|
||||||
margin-left: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* checklist vertical alignment */
|
|
||||||
.editable-checklist label input[type="checkbox"],
|
|
||||||
.editable-checklist label span {
|
|
||||||
vertical-align: middle;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-checklist label {
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set exact width of textarea to fit buttons toolbar */
|
|
||||||
.editable-wysihtml5 {
|
|
||||||
width: 566px;
|
|
||||||
height: 250px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* clear button shown as link in date inputs */
|
|
||||||
.editable-clear {
|
|
||||||
clear: both;
|
|
||||||
font-size: 0.9em;
|
|
||||||
text-decoration: none;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* IOS-style clear button for text inputs */
|
|
||||||
.editable-clear-x {
|
|
||||||
background: url('clear.png') center center no-repeat;
|
|
||||||
display: block;
|
|
||||||
width: 13px;
|
|
||||||
height: 13px;
|
|
||||||
position: absolute;
|
|
||||||
opacity: 0.6;
|
|
||||||
z-index: 100;
|
|
||||||
|
|
||||||
top: 50%;
|
|
||||||
right: 6px;
|
|
||||||
margin-top: -6px;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-clear-x:hover {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-pre-wrapped {
|
|
||||||
white-space: pre-wrap;
|
|
||||||
}
|
|
||||||
.editable-container.editable-popup {
|
|
||||||
max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-container.popover {
|
|
||||||
width: auto; /* without this rule popover does not stretch */
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-container.editable-inline {
|
|
||||||
display: inline-block;
|
|
||||||
vertical-align: middle;
|
|
||||||
width: auto;
|
|
||||||
/* inline-block emulation for IE7*/
|
|
||||||
zoom: 1;
|
|
||||||
*display: inline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-container.ui-widget {
|
|
||||||
font-size: inherit; /* jqueryui widget font 1.1em too big, overwrite it */
|
|
||||||
z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
|
|
||||||
}
|
|
||||||
.editable-click,
|
|
||||||
a.editable-click,
|
|
||||||
a.editable-click:hover {
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: dashed 1px #0088cc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-click.editable-disabled,
|
|
||||||
a.editable-click.editable-disabled,
|
|
||||||
a.editable-click.editable-disabled:hover {
|
|
||||||
color: #585858;
|
|
||||||
cursor: default;
|
|
||||||
border-bottom: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-empty, .editable-empty:hover, .editable-empty:focus{
|
|
||||||
font-style: italic;
|
|
||||||
color: #DD1144;
|
|
||||||
/* border-bottom: none; */
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-unsaved {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-unsaved:after {
|
|
||||||
/* content: '*'*/
|
|
||||||
}
|
|
||||||
|
|
||||||
.editable-bg-transition {
|
|
||||||
-webkit-transition: background-color 1400ms ease-out;
|
|
||||||
-moz-transition: background-color 1400ms ease-out;
|
|
||||||
-o-transition: background-color 1400ms ease-out;
|
|
||||||
-ms-transition: background-color 1400ms ease-out;
|
|
||||||
transition: background-color 1400ms ease-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*see https://github.com/vitalets/x-editable/issues/139 */
|
|
||||||
.form-horizontal .editable
|
|
||||||
{
|
|
||||||
padding-top: 5px;
|
|
||||||
display:inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Datepicker for Bootstrap
|
|
||||||
*
|
|
||||||
* Copyright 2012 Stefan Petre
|
|
||||||
* Improvements by Andrew Rowls
|
|
||||||
* Licensed under the Apache License v2.0
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
.datepicker {
|
|
||||||
padding: 4px;
|
|
||||||
-webkit-border-radius: 4px;
|
|
||||||
-moz-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
|
||||||
direction: ltr;
|
|
||||||
/*.dow {
|
|
||||||
border-top: 1px solid #ddd !important;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
}
|
|
||||||
.datepicker-inline {
|
|
||||||
width: 220px;
|
|
||||||
}
|
|
||||||
.datepicker.datepicker-rtl {
|
|
||||||
direction: rtl;
|
|
||||||
}
|
|
||||||
.datepicker.datepicker-rtl table tr td span {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
.datepicker-dropdown {
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
.datepicker-dropdown:before {
|
|
||||||
content: '';
|
|
||||||
display: inline-block;
|
|
||||||
border-left: 7px solid transparent;
|
|
||||||
border-right: 7px solid transparent;
|
|
||||||
border-bottom: 7px solid #ccc;
|
|
||||||
border-bottom-color: rgba(0, 0, 0, 0.2);
|
|
||||||
position: absolute;
|
|
||||||
top: -7px;
|
|
||||||
left: 6px;
|
|
||||||
}
|
|
||||||
.datepicker-dropdown:after {
|
|
||||||
content: '';
|
|
||||||
display: inline-block;
|
|
||||||
border-left: 6px solid transparent;
|
|
||||||
border-right: 6px solid transparent;
|
|
||||||
border-bottom: 6px solid #ffffff;
|
|
||||||
position: absolute;
|
|
||||||
top: -6px;
|
|
||||||
left: 7px;
|
|
||||||
}
|
|
||||||
.datepicker > div {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.datepicker.days div.datepicker-days {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.datepicker.months div.datepicker-months {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.datepicker.years div.datepicker-years {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.datepicker table {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
.datepicker td,
|
|
||||||
.datepicker th {
|
|
||||||
text-align: center;
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
-webkit-border-radius: 4px;
|
|
||||||
-moz-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
.table-striped .datepicker table tr td,
|
|
||||||
.table-striped .datepicker table tr th {
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.day:hover {
|
|
||||||
background: #eeeeee;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.old,
|
|
||||||
.datepicker table tr td.new {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.disabled,
|
|
||||||
.datepicker table tr td.disabled:hover {
|
|
||||||
background: none;
|
|
||||||
color: #999999;
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.today,
|
|
||||||
.datepicker table tr td.today:hover,
|
|
||||||
.datepicker table tr td.today.disabled,
|
|
||||||
.datepicker table tr td.today.disabled:hover {
|
|
||||||
background-color: #fde19a;
|
|
||||||
background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
|
|
||||||
background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
|
|
||||||
background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
|
|
||||||
background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
|
|
||||||
background-image: linear-gradient(top, #fdd49a, #fdf59a);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
|
|
||||||
border-color: #fdf59a #fdf59a #fbed50;
|
|
||||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.today:hover,
|
|
||||||
.datepicker table tr td.today:hover:hover,
|
|
||||||
.datepicker table tr td.today.disabled:hover,
|
|
||||||
.datepicker table tr td.today.disabled:hover:hover,
|
|
||||||
.datepicker table tr td.today:active,
|
|
||||||
.datepicker table tr td.today:hover:active,
|
|
||||||
.datepicker table tr td.today.disabled:active,
|
|
||||||
.datepicker table tr td.today.disabled:hover:active,
|
|
||||||
.datepicker table tr td.today.active,
|
|
||||||
.datepicker table tr td.today:hover.active,
|
|
||||||
.datepicker table tr td.today.disabled.active,
|
|
||||||
.datepicker table tr td.today.disabled:hover.active,
|
|
||||||
.datepicker table tr td.today.disabled,
|
|
||||||
.datepicker table tr td.today:hover.disabled,
|
|
||||||
.datepicker table tr td.today.disabled.disabled,
|
|
||||||
.datepicker table tr td.today.disabled:hover.disabled,
|
|
||||||
.datepicker table tr td.today[disabled],
|
|
||||||
.datepicker table tr td.today:hover[disabled],
|
|
||||||
.datepicker table tr td.today.disabled[disabled],
|
|
||||||
.datepicker table tr td.today.disabled:hover[disabled] {
|
|
||||||
background-color: #fdf59a;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.today:active,
|
|
||||||
.datepicker table tr td.today:hover:active,
|
|
||||||
.datepicker table tr td.today.disabled:active,
|
|
||||||
.datepicker table tr td.today.disabled:hover:active,
|
|
||||||
.datepicker table tr td.today.active,
|
|
||||||
.datepicker table tr td.today:hover.active,
|
|
||||||
.datepicker table tr td.today.disabled.active,
|
|
||||||
.datepicker table tr td.today.disabled:hover.active {
|
|
||||||
background-color: #fbf069 \9;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.today:hover:hover {
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.today.active:hover {
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.range,
|
|
||||||
.datepicker table tr td.range:hover,
|
|
||||||
.datepicker table tr td.range.disabled,
|
|
||||||
.datepicker table tr td.range.disabled:hover {
|
|
||||||
background: #eeeeee;
|
|
||||||
-webkit-border-radius: 0;
|
|
||||||
-moz-border-radius: 0;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.range.today,
|
|
||||||
.datepicker table tr td.range.today:hover,
|
|
||||||
.datepicker table tr td.range.today.disabled,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover {
|
|
||||||
background-color: #f3d17a;
|
|
||||||
background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
|
|
||||||
background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
|
|
||||||
background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
|
|
||||||
background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
|
|
||||||
background-image: linear-gradient(top, #f3c17a, #f3e97a);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
|
|
||||||
border-color: #f3e97a #f3e97a #edde34;
|
|
||||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
-webkit-border-radius: 0;
|
|
||||||
-moz-border-radius: 0;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.range.today:hover,
|
|
||||||
.datepicker table tr td.range.today:hover:hover,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover:hover,
|
|
||||||
.datepicker table tr td.range.today:active,
|
|
||||||
.datepicker table tr td.range.today:hover:active,
|
|
||||||
.datepicker table tr td.range.today.disabled:active,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover:active,
|
|
||||||
.datepicker table tr td.range.today.active,
|
|
||||||
.datepicker table tr td.range.today:hover.active,
|
|
||||||
.datepicker table tr td.range.today.disabled.active,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover.active,
|
|
||||||
.datepicker table tr td.range.today.disabled,
|
|
||||||
.datepicker table tr td.range.today:hover.disabled,
|
|
||||||
.datepicker table tr td.range.today.disabled.disabled,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover.disabled,
|
|
||||||
.datepicker table tr td.range.today[disabled],
|
|
||||||
.datepicker table tr td.range.today:hover[disabled],
|
|
||||||
.datepicker table tr td.range.today.disabled[disabled],
|
|
||||||
.datepicker table tr td.range.today.disabled:hover[disabled] {
|
|
||||||
background-color: #f3e97a;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.range.today:active,
|
|
||||||
.datepicker table tr td.range.today:hover:active,
|
|
||||||
.datepicker table tr td.range.today.disabled:active,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover:active,
|
|
||||||
.datepicker table tr td.range.today.active,
|
|
||||||
.datepicker table tr td.range.today:hover.active,
|
|
||||||
.datepicker table tr td.range.today.disabled.active,
|
|
||||||
.datepicker table tr td.range.today.disabled:hover.active {
|
|
||||||
background-color: #efe24b \9;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.selected,
|
|
||||||
.datepicker table tr td.selected:hover,
|
|
||||||
.datepicker table tr td.selected.disabled,
|
|
||||||
.datepicker table tr td.selected.disabled:hover {
|
|
||||||
background-color: #9e9e9e;
|
|
||||||
background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
|
|
||||||
background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
|
|
||||||
background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
|
|
||||||
background-image: -o-linear-gradient(top, #b3b3b3, #808080);
|
|
||||||
background-image: linear-gradient(top, #b3b3b3, #808080);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
|
|
||||||
border-color: #808080 #808080 #595959;
|
|
||||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
color: #fff;
|
|
||||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
|
||||||
}
|
|
||||||
.datepicker table tr td.selected:hover,
|
|
||||||
.datepicker table tr td.selected:hover:hover,
|
|
||||||
.datepicker table tr td.selected.disabled:hover,
|
|
||||||
.datepicker table tr td.selected.disabled:hover:hover,
|
|
||||||
.datepicker table tr td.selected:active,
|
|
||||||
.datepicker table tr td.selected:hover:active,
|
|
||||||
.datepicker table tr td.selected.disabled:active,
|
|
||||||
.datepicker table tr td.selected.disabled:hover:active,
|
|
||||||
.datepicker table tr td.selected.active,
|
|
||||||
.datepicker table tr td.selected:hover.active,
|
|
||||||
.datepicker table tr td.selected.disabled.active,
|
|
||||||
.datepicker table tr td.selected.disabled:hover.active,
|
|
||||||
.datepicker table tr td.selected.disabled,
|
|
||||||
.datepicker table tr td.selected:hover.disabled,
|
|
||||||
.datepicker table tr td.selected.disabled.disabled,
|
|
||||||
.datepicker table tr td.selected.disabled:hover.disabled,
|
|
||||||
.datepicker table tr td.selected[disabled],
|
|
||||||
.datepicker table tr td.selected:hover[disabled],
|
|
||||||
.datepicker table tr td.selected.disabled[disabled],
|
|
||||||
.datepicker table tr td.selected.disabled:hover[disabled] {
|
|
||||||
background-color: #808080;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.selected:active,
|
|
||||||
.datepicker table tr td.selected:hover:active,
|
|
||||||
.datepicker table tr td.selected.disabled:active,
|
|
||||||
.datepicker table tr td.selected.disabled:hover:active,
|
|
||||||
.datepicker table tr td.selected.active,
|
|
||||||
.datepicker table tr td.selected:hover.active,
|
|
||||||
.datepicker table tr td.selected.disabled.active,
|
|
||||||
.datepicker table tr td.selected.disabled:hover.active {
|
|
||||||
background-color: #666666 \9;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.active,
|
|
||||||
.datepicker table tr td.active:hover,
|
|
||||||
.datepicker table tr td.active.disabled,
|
|
||||||
.datepicker table tr td.active.disabled:hover {
|
|
||||||
background-color: #006dcc;
|
|
||||||
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
|
|
||||||
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -o-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
|
|
||||||
border-color: #0044cc #0044cc #002a80;
|
|
||||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
color: #fff;
|
|
||||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
|
||||||
}
|
|
||||||
.datepicker table tr td.active:hover,
|
|
||||||
.datepicker table tr td.active:hover:hover,
|
|
||||||
.datepicker table tr td.active.disabled:hover,
|
|
||||||
.datepicker table tr td.active.disabled:hover:hover,
|
|
||||||
.datepicker table tr td.active:active,
|
|
||||||
.datepicker table tr td.active:hover:active,
|
|
||||||
.datepicker table tr td.active.disabled:active,
|
|
||||||
.datepicker table tr td.active.disabled:hover:active,
|
|
||||||
.datepicker table tr td.active.active,
|
|
||||||
.datepicker table tr td.active:hover.active,
|
|
||||||
.datepicker table tr td.active.disabled.active,
|
|
||||||
.datepicker table tr td.active.disabled:hover.active,
|
|
||||||
.datepicker table tr td.active.disabled,
|
|
||||||
.datepicker table tr td.active:hover.disabled,
|
|
||||||
.datepicker table tr td.active.disabled.disabled,
|
|
||||||
.datepicker table tr td.active.disabled:hover.disabled,
|
|
||||||
.datepicker table tr td.active[disabled],
|
|
||||||
.datepicker table tr td.active:hover[disabled],
|
|
||||||
.datepicker table tr td.active.disabled[disabled],
|
|
||||||
.datepicker table tr td.active.disabled:hover[disabled] {
|
|
||||||
background-color: #0044cc;
|
|
||||||
}
|
|
||||||
.datepicker table tr td.active:active,
|
|
||||||
.datepicker table tr td.active:hover:active,
|
|
||||||
.datepicker table tr td.active.disabled:active,
|
|
||||||
.datepicker table tr td.active.disabled:hover:active,
|
|
||||||
.datepicker table tr td.active.active,
|
|
||||||
.datepicker table tr td.active:hover.active,
|
|
||||||
.datepicker table tr td.active.disabled.active,
|
|
||||||
.datepicker table tr td.active.disabled:hover.active {
|
|
||||||
background-color: #003399 \9;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span {
|
|
||||||
display: block;
|
|
||||||
width: 23%;
|
|
||||||
height: 54px;
|
|
||||||
line-height: 54px;
|
|
||||||
float: left;
|
|
||||||
margin: 1%;
|
|
||||||
cursor: pointer;
|
|
||||||
-webkit-border-radius: 4px;
|
|
||||||
-moz-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span:hover {
|
|
||||||
background: #eeeeee;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span.disabled,
|
|
||||||
.datepicker table tr td span.disabled:hover {
|
|
||||||
background: none;
|
|
||||||
color: #999999;
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span.active,
|
|
||||||
.datepicker table tr td span.active:hover,
|
|
||||||
.datepicker table tr td span.active.disabled,
|
|
||||||
.datepicker table tr td span.active.disabled:hover {
|
|
||||||
background-color: #006dcc;
|
|
||||||
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
|
|
||||||
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: -o-linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-image: linear-gradient(top, #0088cc, #0044cc);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
|
|
||||||
border-color: #0044cc #0044cc #002a80;
|
|
||||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
|
||||||
color: #fff;
|
|
||||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
|
||||||
}
|
|
||||||
.datepicker table tr td span.active:hover,
|
|
||||||
.datepicker table tr td span.active:hover:hover,
|
|
||||||
.datepicker table tr td span.active.disabled:hover,
|
|
||||||
.datepicker table tr td span.active.disabled:hover:hover,
|
|
||||||
.datepicker table tr td span.active:active,
|
|
||||||
.datepicker table tr td span.active:hover:active,
|
|
||||||
.datepicker table tr td span.active.disabled:active,
|
|
||||||
.datepicker table tr td span.active.disabled:hover:active,
|
|
||||||
.datepicker table tr td span.active.active,
|
|
||||||
.datepicker table tr td span.active:hover.active,
|
|
||||||
.datepicker table tr td span.active.disabled.active,
|
|
||||||
.datepicker table tr td span.active.disabled:hover.active,
|
|
||||||
.datepicker table tr td span.active.disabled,
|
|
||||||
.datepicker table tr td span.active:hover.disabled,
|
|
||||||
.datepicker table tr td span.active.disabled.disabled,
|
|
||||||
.datepicker table tr td span.active.disabled:hover.disabled,
|
|
||||||
.datepicker table tr td span.active[disabled],
|
|
||||||
.datepicker table tr td span.active:hover[disabled],
|
|
||||||
.datepicker table tr td span.active.disabled[disabled],
|
|
||||||
.datepicker table tr td span.active.disabled:hover[disabled] {
|
|
||||||
background-color: #0044cc;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span.active:active,
|
|
||||||
.datepicker table tr td span.active:hover:active,
|
|
||||||
.datepicker table tr td span.active.disabled:active,
|
|
||||||
.datepicker table tr td span.active.disabled:hover:active,
|
|
||||||
.datepicker table tr td span.active.active,
|
|
||||||
.datepicker table tr td span.active:hover.active,
|
|
||||||
.datepicker table tr td span.active.disabled.active,
|
|
||||||
.datepicker table tr td span.active.disabled:hover.active {
|
|
||||||
background-color: #003399 \9;
|
|
||||||
}
|
|
||||||
.datepicker table tr td span.old,
|
|
||||||
.datepicker table tr td span.new {
|
|
||||||
color: #999999;
|
|
||||||
}
|
|
||||||
.datepicker th.datepicker-switch {
|
|
||||||
width: 145px;
|
|
||||||
}
|
|
||||||
.datepicker thead tr:first-child th,
|
|
||||||
.datepicker tfoot tr th {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.datepicker thead tr:first-child th:hover,
|
|
||||||
.datepicker tfoot tr th:hover {
|
|
||||||
background: #eeeeee;
|
|
||||||
}
|
|
||||||
.datepicker .cw {
|
|
||||||
font-size: 10px;
|
|
||||||
width: 12px;
|
|
||||||
padding: 0 2px 0 5px;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
.datepicker thead tr:first-child th.cw {
|
|
||||||
cursor: default;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
.input-append.date .add-on i,
|
|
||||||
.input-prepend.date .add-on i {
|
|
||||||
display: block;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
}
|
|
||||||
.input-daterange input {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
.input-daterange input:first-child {
|
|
||||||
-webkit-border-radius: 3px 0 0 3px;
|
|
||||||
-moz-border-radius: 3px 0 0 3px;
|
|
||||||
border-radius: 3px 0 0 3px;
|
|
||||||
}
|
|
||||||
.input-daterange input:last-child {
|
|
||||||
-webkit-border-radius: 0 3px 3px 0;
|
|
||||||
-moz-border-radius: 0 3px 3px 0;
|
|
||||||
border-radius: 0 3px 3px 0;
|
|
||||||
}
|
|
||||||
.input-daterange .add-on {
|
|
||||||
display: inline-block;
|
|
||||||
width: auto;
|
|
||||||
min-width: 16px;
|
|
||||||
height: 18px;
|
|
||||||
padding: 4px 5px;
|
|
||||||
font-weight: normal;
|
|
||||||
line-height: 18px;
|
|
||||||
text-align: center;
|
|
||||||
text-shadow: 0 1px 0 #ffffff;
|
|
||||||
vertical-align: middle;
|
|
||||||
background-color: #eeeeee;
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
margin-left: -5px;
|
|
||||||
margin-right: -5px;
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
/*! X-editable - v1.5.1
|
|
||||||
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
|
|
||||||
* http://github.com/vitalets/x-editable
|
|
||||||
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
|
|
||||||
!function(a){"use strict";var b=function(b,c){this.options=a.extend({},a.fn.editableform.defaults,c),this.$div=a(b),this.options.scope||(this.options.scope=this)};b.prototype={constructor:b,initInput:function(){this.input=this.options.input,this.value=this.input.str2value(this.options.value),this.input.prerender()},initTemplate:function(){this.$form=a(a.fn.editableform.template)},initButtons:function(){var b=this.$form.find(".editable-buttons");b.append(a.fn.editableform.buttons),"bottom"===this.options.showbuttons&&b.addClass("editable-buttons-bottom")},render:function(){this.$loading=a(a.fn.editableform.loading),this.$div.empty().append(this.$loading),this.initTemplate(),this.options.showbuttons?this.initButtons():this.$form.find(".editable-buttons").remove(),this.showLoading(),this.isSaving=!1,this.$div.triggerHandler("rendering"),this.initInput(),this.$form.find("div.editable-input").append(this.input.$tpl),this.$div.append(this.$form),a.when(this.input.render()).then(a.proxy(function(){if(this.options.showbuttons||this.input.autosubmit(),this.$form.find(".editable-cancel").click(a.proxy(this.cancel,this)),this.input.error)this.error(this.input.error),this.$form.find(".editable-submit").attr("disabled",!0),this.input.$input.attr("disabled",!0),this.$form.submit(function(a){a.preventDefault()});else{this.error(!1),this.input.$input.removeAttr("disabled"),this.$form.find(".editable-submit").removeAttr("disabled");var b=null===this.value||void 0===this.value||""===this.value?this.options.defaultValue:this.value;this.input.value2input(b),this.$form.submit(a.proxy(this.submit,this))}this.$div.triggerHandler("rendered"),this.showForm(),this.input.postrender&&this.input.postrender()},this))},cancel:function(){this.$div.triggerHandler("cancel")},showLoading:function(){var a,b;this.$form?(a=this.$form.outerWidth(),b=this.$form.outerHeight(),a&&this.$loading.width(a),b&&this.$loading.height(b),this.$form.hide()):(a=this.$loading.parent().width(),a&&this.$loading.width(a)),this.$loading.show()},showForm:function(a){this.$loading.hide(),this.$form.show(),a!==!1&&this.input.activate(),this.$div.triggerHandler("show")},error:function(b){var c,d=this.$form.find(".control-group"),e=this.$form.find(".editable-error-block");if(b===!1)d.removeClass(a.fn.editableform.errorGroupClass),e.removeClass(a.fn.editableform.errorBlockClass).empty().hide();else{if(b){c=(""+b).split("\n");for(var f=0;f<c.length;f++)c[f]=a("<div>").text(c[f]).html();b=c.join("<br>")}d.addClass(a.fn.editableform.errorGroupClass),e.addClass(a.fn.editableform.errorBlockClass).html(b).show()}},submit:function(b){b.stopPropagation(),b.preventDefault();var c=this.input.input2value(),d=this.validate(c);if("object"===a.type(d)&&void 0!==d.newValue){if(c=d.newValue,this.input.value2input(c),"string"==typeof d.msg)return this.error(d.msg),this.showForm(),void 0}else if(d)return this.error(d),this.showForm(),void 0;if(!this.options.savenochange&&this.input.value2str(c)==this.input.value2str(this.value))return this.$div.triggerHandler("nochange"),void 0;var e=this.input.value2submit(c);this.isSaving=!0,a.when(this.save(e)).done(a.proxy(function(a){this.isSaving=!1;var b="function"==typeof this.options.success?this.options.success.call(this.options.scope,a,c):null;return b===!1?(this.error(!1),this.showForm(!1),void 0):"string"==typeof b?(this.error(b),this.showForm(),void 0):(b&&"object"==typeof b&&b.hasOwnProperty("newValue")&&(c=b.newValue),this.error(!1),this.value=c,this.$div.triggerHandler("save",{newValue:c,submitValue:e,response:a}),void 0)},this)).fail(a.proxy(function(a){this.isSaving=!1;var b;b="function"==typeof this.options.error?this.options.error.call(this.options.scope,a,c):"string"==typeof a?a:a.responseText||a.statusText||"Unknown error!",this.error(b),this.showForm()},this))},save:function(b){this.options.pk=a.fn.editableutils.tryParseJson(this.options.pk,!0);var c,d="function"==typeof this.options.pk?this.options.pk.call(this.options.scope):this.options.pk,e=!!("function"==typeof this.options.url||this.options.url&&("always"===this.options.send||"auto"===this.options.send&&null!==d&&void 0!==d));return e?(this.showLoading(),c={name:this.options.name||"",value:b,pk:d},"function"==typeof this.options.params?c=this.options.params.call(this.options.scope,c):(this.options.params=a.fn.editableutils.tryParseJson(this.options.params,!0),a.extend(c,this.options.params)),"function"==typeof this.options.url?this.options.url.call(this.options.scope,c):a.ajax(a.extend({url:this.options.url,data:c,type:"POST"},this.options.ajaxOptions))):void 0},validate:function(a){return void 0===a&&(a=this.value),"function"==typeof this.options.validate?this.options.validate.call(this.options.scope,a):void 0},option:function(a,b){a in this.options&&(this.options[a]=b),"value"===a&&this.setValue(b)},setValue:function(a,b){this.value=b?this.input.str2value(a):a,this.$form&&this.$form.is(":visible")&&this.input.value2input(this.value)}},a.fn.editableform=function(c){var d=aLine truncated
|
|
||||||
var b=function(a){this.init("range",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.number),a.extend(b.prototype,{render:function(){this.$input=this.$tpl.filter("input"),this.setClass(),this.setAttr("min"),this.setAttr("max"),this.setAttr("step"),this.$input.on("input",function(){a(this).siblings("output").text(a(this).val())})},activate:function(){this.$input.focus()}}),b.defaults=a.extend({},a.fn.editabletypes.number.defaults,{tpl:'<input type="range"><output style="width: 30px; display: inline-block"></output>',inputclass:"input-medium"}),a.fn.editabletypes.range=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("time",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.setClass()}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="time">'}),a.fn.editabletypes.time=b}(window.jQuery),function(a){"use strict";var b=function(c){if(this.init("select2",c,b.defaults),c.select2=c.select2||{},this.sourceData=null,c.placeholder&&(c.select2.placeholder=c.placeholder),!c.select2.tags&&c.source){var d=c.source;a.isFunction(c.source)&&(d=c.source.call(c.scope)),"string"==typeof d?(c.select2.ajax=c.select2.ajax||{},c.select2.ajax.data||(c.select2.ajax.data=function(a){return{query:a}}),c.select2.ajax.results||(c.select2.ajax.results=function(a){return{results:a}}),c.select2.ajax.url=d):(this.sourceData=this.convertSource(d),c.select2.data=this.sourceData)}if(this.options.select2=a.extend({},b.defaults.select2,c.select2),this.isMultiple=this.options.select2.tags||this.options.select2.multiple,this.isRemote="ajax"in this.options.select2,this.idFunc=this.options.select2.id,"function"!=typeof this.idFunc){var e=this.idFunc||"id";this.idFunc=function(a){return a[e]}}this.formatSelection=this.options.select2.formatSelection,"function"!=typeof this.formatSelection&&(this.formatSelection=function(a){return a.text})};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.setClass(),this.isRemote&&this.$input.on("select2-loaded",a.proxy(function(a){this.sourceData=a.items.results},this)),this.isMultiple&&this.$input.on("change",function(){a(this).closest("form").parent().triggerHandler("resize")})},value2html:function(c,d){var e,f="",g=this;this.options.select2.tags?e=c:this.sourceData&&(e=a.fn.editableutils.itemsByValue(c,this.sourceData,this.idFunc)),a.isArray(e)?(f=[],a.each(e,function(a,b){f.push(b&&"object"==typeof b?g.formatSelection(b):b)})):e&&(f=g.formatSelection(e)),f=a.isArray(f)?f.join(this.options.viewseparator):f,b.superclass.value2html.call(this,f,d)},html2value:function(a){return this.options.select2.tags?this.str2value(a,this.options.viewseparator):null},value2input:function(b){if(a.isArray(b)&&(b=b.join(this.getSeparator())),this.$input.data("select2")?this.$input.val(b).trigger("change",!0):(this.$input.val(b),this.$input.select2(this.options.select2)),this.isRemote&&!this.isMultiple&&!this.options.select2.initSelection){var c=this.options.select2.id,d=this.options.select2.formatSelection;if(!c&&!d){var e=a(this.options.scope);if(!e.data("editable").isEmpty){var f={id:b,text:e.text()};this.$input.select2("data",f)}}}},input2value:function(){return this.$input.select2("val")},str2value:function(b,c){if("string"!=typeof b||!this.isMultiple)return b;c=c||this.getSeparator();var d,e,f;if(null===b||b.length<1)return null;for(d=b.split(c),e=0,f=d.length;f>e;e+=1)d[e]=a.trim(d[e]);return d},autosubmit:function(){this.$input.on("change",function(b,c){c||a(this).closest("form").submit()})},getSeparator:function(){return this.options.select2.separator||a.fn.select2.defaults.separator},convertSource:function(b){if(a.isArray(b)&&b.length&&void 0!==b[0].value)for(var c=0;c<b.length;c++)void 0!==b[c].value&&(b[c].id=b[c].value,delete b[c].value);return b},destroy:function(){this.$input.data("select2")&&this.$input.select2("destroy")}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="hidden">',select2:null,placeholder:null,source:null,viewseparator:", "}),a.fn.editabletypes.select2=b}(window.jQuery),function(a){var b=function(b,c){return this.$element=a(b),this.$element.is("input")?(this.options=a.extend({},a.fn.combodate.defaults,c,this.$element.data()),this.init(),void 0):(a.error("Combodate should be applied to INPUT element"),void 0)};b.prototype={constructor:b,init:function(){this.map={day:["D","date"],month:["M","month"],year:["Y","year"],hour:["[Hh]","hours"],minute:["m","minutes"],second:["s","seconds"],ampm:["[Aa]",""]},this.$widget=a('<span class="combodate"></span>').html(this.getTemplate()),this.initCombos(),this.$widget.on("change","select",a.proxy(function(b){this.$element.val(this.getValue()).change(),this.options.smartDays&&(a(b.target).is(".month")||a(b.target).is(".year"))&&this.fillCombo("day")},this)),this.$widget.find("select").css("width","auto"),this.$element.hide().after(tLine truncated
|
|
||||||
},getDaysInMonth:function(a,b){return[31,l.isLeapYear(a)?29:28,31,30,31,30,31,31,30,31,30,31][b]},validParts:/dd?|DD?|mm?|MM?|yy(?:yy)?/g,nonpunctuation:/[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g,parseFormat:function(a){var b=a.replace(this.validParts,"\0").split("\0"),c=a.match(this.validParts);if(!b||!b.length||!c||0===c.length)throw new Error("Invalid date format.");return{separators:b,parts:c}},parseDate:function(c,d,f){if(c instanceof Date)return c;if("string"==typeof d&&(d=l.parseFormat(d)),/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(c)){var g,h,i=/([\-+]\d+)([dmwy])/,j=c.match(/([\-+]\d+)([dmwy])/g);c=new Date;for(var m=0;m<j.length;m++)switch(g=i.exec(j[m]),h=parseInt(g[1]),g[2]){case"d":c.setUTCDate(c.getUTCDate()+h);break;case"m":c=e.prototype.moveMonth.call(e.prototype,c,h);break;case"w":c.setUTCDate(c.getUTCDate()+7*h);break;case"y":c=e.prototype.moveYear.call(e.prototype,c,h)}return b(c.getUTCFullYear(),c.getUTCMonth(),c.getUTCDate(),0,0,0)}var n,o,g,j=c&&c.match(this.nonpunctuation)||[],c=new Date,p={},q=["yyyy","yy","M","MM","m","mm","d","dd"],r={yyyy:function(a,b){return a.setUTCFullYear(b)},yy:function(a,b){return a.setUTCFullYear(2e3+b)},m:function(a,b){for(b-=1;0>b;)b+=12;for(b%=12,a.setUTCMonth(b);a.getUTCMonth()!=b;)a.setUTCDate(a.getUTCDate()-1);return a},d:function(a,b){return a.setUTCDate(b)}};r.M=r.MM=r.mm=r.m,r.dd=r.d,c=b(c.getFullYear(),c.getMonth(),c.getDate(),0,0,0);var s=d.parts.slice();if(j.length!=s.length&&(s=a(s).filter(function(b,c){return-1!==a.inArray(c,q)}).toArray()),j.length==s.length){for(var m=0,t=s.length;t>m;m++){if(n=parseInt(j[m],10),g=s[m],isNaN(n))switch(g){case"MM":o=a(k[f].months).filter(function(){var a=this.slice(0,j[m].length),b=j[m].slice(0,a.length);return a==b}),n=a.inArray(o[0],k[f].months)+1;break;case"M":o=a(k[f].monthsShort).filter(function(){var a=this.slice(0,j[m].length),b=j[m].slice(0,a.length);return a==b}),n=a.inArray(o[0],k[f].monthsShort)+1}p[g]=n}for(var u,m=0;m<q.length;m++)u=q[m],u in p&&!isNaN(p[u])&&r[u](c,p[u])}return c},formatDate:function(b,c,d){"string"==typeof c&&(c=l.parseFormat(c));var e={d:b.getUTCDate(),D:k[d].daysShort[b.getUTCDay()],DD:k[d].days[b.getUTCDay()],m:b.getUTCMonth()+1,M:k[d].monthsShort[b.getUTCMonth()],MM:k[d].months[b.getUTCMonth()],yy:b.getUTCFullYear().toString().substring(2),yyyy:b.getUTCFullYear()};e.dd=(e.d<10?"0":"")+e.d,e.mm=(e.m<10?"0":"")+e.m;for(var b=[],f=a.extend([],c.separators),g=0,h=c.parts.length;h>=g;g++)f.length&&b.push(f.shift()),b.push(e[c.parts[g]]);return b.join("")},headTemplate:'<thead><tr><th class="prev"><i class="icon-arrow-left"/></th><th colspan="5" class="datepicker-switch"></th><th class="next"><i class="icon-arrow-right"/></th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr><tr><th colspan="7" class="clear"></th></tr></tfoot>'};l.template='<div class="datepicker"><div class="datepicker-days"><table class=" table-condensed">'+l.headTemplate+"<tbody></tbody>"+l.footTemplate+"</table>"+"</div>"+'<div class="datepicker-months">'+'<table class="table-condensed">'+l.headTemplate+l.contTemplate+l.footTemplate+"</table>"+"</div>"+'<div class="datepicker-years">'+'<table class="table-condensed">'+l.headTemplate+l.contTemplate+l.footTemplate+"</table>"+"</div>"+"</div>",a.fn.datepicker.DPGlobal=l,a.fn.datepicker.noConflict=function(){return a.fn.datepicker=g,this},a(document).on("focus.datepicker.data-api click.datepicker.data-api",'[data-provide="datepicker"]',function(b){var c=a(this);c.data("datepicker")||(b.preventDefault(),h.call(c,"show"))}),a(function(){h.call(a('[data-provide="datepicker-inline"]'))})}(window.jQuery),function(a){"use strict";a.fn.bdatepicker=a.fn.datepicker.noConflict(),a.fn.datepicker||(a.fn.datepicker=a.fn.bdatepicker);var b=function(a){this.init("date",a,b.defaults),this.initPicker(a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{initPicker:function(b,c){this.options.viewformat||(this.options.viewformat=this.options.format),b.datepicker=a.fn.editableutils.tryParseJson(b.datepicker,!0),this.options.datepicker=a.extend({},c.datepicker,b.datepicker,{format:this.options.viewformat}),this.options.datepicker.language=this.options.datepicker.language||"en",this.dpg=a.fn.bdatepicker.DPGlobal,this.parsedFormat=this.dpg.parseFormat(this.options.format),this.parsedViewFormat=this.dpg.parseFormat(this.options.viewformat)},render:function(){this.$input.bdatepicker(this.options.datepicker),this.options.clear&&(this.$clear=a('<a href="#"></a>').html(this.options.clear).click(a.proxy(function(a){a.preventDefault(),a.stopPropagation(),this.clear()},this)),this.$tpl.parent().append(a('<div class="editable-clear">').append(this.$clear)))},value2html:function(a,c){var d=a?this.dpg.formatDate(a,this.parsedViewFormat,this.options.datepicker.language):"";b.superclass.value2html.call(this,d,c)},html2value:function(a){return this.parseDate(a,tLine truncated
|
|
||||||
-187
@@ -1,187 +0,0 @@
|
|||||||
/* eslint-disable no-unused-vars */
|
|
||||||
/**
|
|
||||||
* @author zhixin wen <wenzhixin2010@gmail.com>
|
|
||||||
* extensions: https://github.com/vitalets/x-editable
|
|
||||||
*/
|
|
||||||
|
|
||||||
const Utils = $.fn.bootstrapTable.utils
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.defaults, {
|
|
||||||
editable: true,
|
|
||||||
onEditableInit () {
|
|
||||||
return false
|
|
||||||
},
|
|
||||||
onEditableSave (field, row, rowIndex, oldValue, $el) {
|
|
||||||
return false
|
|
||||||
},
|
|
||||||
onEditableShown (field, row, $el, editable) {
|
|
||||||
return false
|
|
||||||
},
|
|
||||||
onEditableHidden (field, row, $el, reason) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.columnDefaults, {
|
|
||||||
alwaysUseFormatter: false
|
|
||||||
})
|
|
||||||
|
|
||||||
$.extend($.fn.bootstrapTable.Constructor.EVENTS, {
|
|
||||||
'editable-init.bs.table': 'onEditableInit',
|
|
||||||
'editable-save.bs.table': 'onEditableSave',
|
|
||||||
'editable-shown.bs.table': 'onEditableShown',
|
|
||||||
'editable-hidden.bs.table': 'onEditableHidden'
|
|
||||||
})
|
|
||||||
|
|
||||||
$.BootstrapTable = class extends $.BootstrapTable {
|
|
||||||
initTable () {
|
|
||||||
super.initTable()
|
|
||||||
|
|
||||||
if (!this.options.editable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.editedCells = []
|
|
||||||
$.each(this.columns, (i, column) => {
|
|
||||||
if (!column.editable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const editableOptions = {}
|
|
||||||
const editableDataMarkup = []
|
|
||||||
const editableDataPrefix = 'editable-'
|
|
||||||
const processDataOptions = (key, value) => {
|
|
||||||
// Replace camel case with dashes.
|
|
||||||
const dashKey = key.replace(/([A-Z])/g, $1 => `-${$1.toLowerCase()}`)
|
|
||||||
|
|
||||||
if (dashKey.indexOf(editableDataPrefix) === 0) {
|
|
||||||
editableOptions[dashKey.replace(editableDataPrefix, 'data-')] = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$.each(this.options, processDataOptions)
|
|
||||||
|
|
||||||
column.formatter = column.formatter || (value => value)
|
|
||||||
column._formatter = column._formatter ? column._formatter : column.formatter
|
|
||||||
column.formatter = (value, row, index) => {
|
|
||||||
let result = Utils.calculateObjectValue(column, column._formatter, [value, row, index], value)
|
|
||||||
|
|
||||||
result = typeof result === 'undefined' || result === null ? this.options.undefinedText : result
|
|
||||||
if (this.options.uniqueId !== undefined && !column.alwaysUseFormatter) {
|
|
||||||
const uniqueId = Utils.getItemField(row, this.options.uniqueId, false)
|
|
||||||
|
|
||||||
if ($.inArray(column.field + uniqueId, this.editedCells) !== -1) {
|
|
||||||
result = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$.each(column, processDataOptions)
|
|
||||||
|
|
||||||
$.each(editableOptions, (key, value) => {
|
|
||||||
editableDataMarkup.push(` ${key}="${value}"`)
|
|
||||||
})
|
|
||||||
|
|
||||||
let noEditFormatter = false
|
|
||||||
const editableOpts = Utils.calculateObjectValue(column,
|
|
||||||
column.editable, [index, row], {})
|
|
||||||
|
|
||||||
if (editableOpts.hasOwnProperty('noEditFormatter')) {
|
|
||||||
noEditFormatter = editableOpts.noEditFormatter(value, row, index)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (noEditFormatter === false) {
|
|
||||||
return `<a href="javascript:void(0)"
|
|
||||||
data-name="${column.field}"
|
|
||||||
data-pk="${row[this.options.idField]}"
|
|
||||||
data-value="${result}"
|
|
||||||
${editableDataMarkup.join('')}></a>`
|
|
||||||
}
|
|
||||||
return noEditFormatter
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
initBody (fixedScroll) {
|
|
||||||
super.initBody(fixedScroll)
|
|
||||||
|
|
||||||
if (!this.options.editable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
$.each(this.columns, (i, column) => {
|
|
||||||
if (!column.editable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = this.getData({ escape: true })
|
|
||||||
const $field = this.$body.find(`a[data-name="${column.field}"]`)
|
|
||||||
|
|
||||||
$field.each((i, element) => {
|
|
||||||
const $element = $(element)
|
|
||||||
const $tr = $element.closest('tr')
|
|
||||||
const index = $tr.data('index')
|
|
||||||
const row = data[index]
|
|
||||||
|
|
||||||
const editableOpts = Utils.calculateObjectValue(column,
|
|
||||||
column.editable, [index, row, $element], {})
|
|
||||||
|
|
||||||
$element.editable(editableOpts)
|
|
||||||
})
|
|
||||||
|
|
||||||
$field.off('save').on('save', ({ currentTarget }, { submitValue }) => {
|
|
||||||
const $this = $(currentTarget)
|
|
||||||
const data = this.getData()
|
|
||||||
const rowIndex = $this.parents('tr[data-index]').data('index')
|
|
||||||
const row = data[rowIndex]
|
|
||||||
const oldValue = row[column.field]
|
|
||||||
|
|
||||||
if (this.options.uniqueId !== undefined && !column.alwaysUseFormatter) {
|
|
||||||
const uniqueId = Utils.getItemField(row, this.options.uniqueId, false)
|
|
||||||
|
|
||||||
if ($.inArray(column.field + uniqueId, this.editedCells) === -1) {
|
|
||||||
this.editedCells.push(column.field + uniqueId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
submitValue = Utils.escapeHTML(submitValue)
|
|
||||||
$this.data('value', submitValue)
|
|
||||||
row[column.field] = submitValue
|
|
||||||
this.trigger('editable-save', column.field, row, rowIndex, oldValue, $this)
|
|
||||||
this.initBody()
|
|
||||||
})
|
|
||||||
|
|
||||||
$field.off('shown').on('shown', ({ currentTarget }, editable) => {
|
|
||||||
const $this = $(currentTarget)
|
|
||||||
const data = this.getData()
|
|
||||||
const rowIndex = $this.parents('tr[data-index]').data('index')
|
|
||||||
const row = data[rowIndex]
|
|
||||||
|
|
||||||
this.trigger('editable-shown', column.field, row, $this, editable)
|
|
||||||
})
|
|
||||||
|
|
||||||
$field.off('hidden').on('hidden', ({ currentTarget }, reason) => {
|
|
||||||
const $this = $(currentTarget)
|
|
||||||
const data = this.getData()
|
|
||||||
const rowIndex = $this.parents('tr[data-index]').data('index')
|
|
||||||
const row = data[rowIndex]
|
|
||||||
|
|
||||||
this.trigger('editable-hidden', column.field, row, $this, reason)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
this.trigger('editable-init')
|
|
||||||
}
|
|
||||||
|
|
||||||
getData (params) {
|
|
||||||
const data = super.getData(params)
|
|
||||||
|
|
||||||
if (params && params.escape) {
|
|
||||||
for (const row of data) {
|
|
||||||
for (const [key, value] of Object.entries(row)) {
|
|
||||||
row[key] = Utils.unescapeHTML(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
/*
|
|
||||||
* bootstrap-table - v1.11.0 - 2016-07-02
|
|
||||||
* https://github.com/wenzhixin/bootstrap-table
|
|
||||||
* Copyright (c) 2016 zhixin wen
|
|
||||||
* Licensed MIT License
|
|
||||||
*/
|
|
||||||
!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{editable:!0,onEditableInit:function(){return!1},onEditableSave:function(){return!1},onEditableShown:function(){return!1},onEditableHidden:function(){return!1}}),a.extend(a.fn.bootstrapTable.Constructor.EVENTS,{"editable-init.bs.table":"onEditableInit","editable-save.bs.table":"onEditableSave","editable-shown.bs.table":"onEditableShown","editable-hidden.bs.table":"onEditableHidden"});var b=a.fn.bootstrapTable.Constructor,c=b.prototype.initTable,d=b.prototype.initBody;b.prototype.initTable=function(){var b=this;c.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&a.each(this.columns,function(c,d){if(d.editable){var e={},f=[],g="editable-",h=function(a,b){var c=a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()});if(c.slice(0,g.length)==g){var d=c.replace(g,"data-");e[d]=b}};a.each(b.options,h),d.formatter=d.formatter||function(a){return a},d._formatter=d._formatter?d._formatter:d.formatter,d.formatter=function(c,g,i){var j=d._formatter?d._formatter(c,g,i):c;a.each(d,h),a.each(e,function(a,b){f.push(" "+a+'="'+b+'"')});var k=!1;return d.editable.hasOwnProperty("noeditFormatter")&&(k=d.editable.noeditFormatter(c,g,i)),k===!1?['<a href="javascript:void(0)"',' data-name="'+d.field+'"',' data-pk="'+g[b.options.idField]+'"',' data-value="'+j+'"',f.join(""),"></a>"].join(""):k}}})},b.prototype.initBody=function(){var b=this;d.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&(a.each(this.columns,function(c,d){d.editable&&(b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("save").on("save",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g],i=h[d.field];a(this).data("value",e.submitValue),h[d.field]=e.submitValue,b.trigger("editable-save",d.field,h,i,a(this)),b.resetFooter()}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("shown").on("shown",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-shown",d.field,h,a(this),e)}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("hidden").on("hidden",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-hidden",d.field,h,a(this),e)}))}),this.trigger("editable-init"))}}(jQuery);
|
|
||||||
Loaded 100 of 4685 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user