pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-08 17:12:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.项目样式 scss 全部转换为 less，且移除了项目 node-sass 依赖；

Browse Source 
2.online开发ButtonExpHandler is not defined #957；
3.关于打包后JS文件过大，导致加载缓慢的建议 #969
This commit is contained in:
zhangdaiscott
2020-03-04 22:37:17 +08:00
parent 4c0c0945a1
commit 91594ddb1a
73 changed files with 297 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ant-design-vue-jeecg/src/assets/checkcode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

2
ant-design-vue-jeecg/src/components/ChartCard.vue
View File

@ -42,7 +42,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.chart-card-header {
position: relative;
overflow: hidden;

2
ant-design-vue-jeecg/src/components/chart/AreaChartTy.vue
View File

@ -83,6 +83,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
@import "chart";
</style>

2
ant-design-vue-jeecg/src/components/chart/MiniArea.vue
View File

@ -64,6 +64,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
@import "chart";
</style>

2
ant-design-vue-jeecg/src/components/chart/MiniBar.vue
View File

@ -71,6 +71,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
@import "chart";
</style>

2
ant-design-vue-jeecg/src/components/chart/MiniProgress.vue
View File

@ -34,7 +34,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.chart-mini-progress {
padding: 5px 0;
position: relative;

2
ant-design-vue-jeecg/src/components/chart/RankList.vue
View File

@ -32,7 +32,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.rank {
padding: 0 32px 32px 72px;

2
ant-design-vue-jeecg/src/components/chart/Trend.vue
View File

@ -52,7 +52,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.chart-trend {
display: inline-block;
font-size: 14px;

0
ant-design-vue-jeecg/src/components/chart/chart.scss → ant-design-vue-jeecg/src/components/chart/chart.less
View File

5
ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
View File

@ -125,7 +125,7 @@
}
</script>
<style lang="scss">
<style lang="less">
.j-modal-box {
&.fullscreen {
@ -180,8 +180,5 @@
}
}
/deep/ {
}
}
</style>

2
ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
View File

@ -420,7 +420,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.j-super-query-box {
display: inline-block;

4
ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
View File

@ -829,7 +829,7 @@
}
</script>
<style lang="scss">
<style lang="less">
.card-container {
background: #fff;
overflow: hidden;
@ -877,7 +877,7 @@
}
}
</style>
<style lang="scss" scoped>
<style lang="less" scoped>
.container-widthEn{
width: 755px;
}

12
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/index.vue
View File

@ -132,27 +132,25 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.j-select-biz-component-box {
$width: 82px;
@width: 82px;
.left {
width: calc(100% - #{$width} - 8px);
width: calc(100% - @width - 8px);
}
.right {
width: #{$width};
width: @width ;
}
.full {
width: 100%;
}
/deep/ {
.ant-select-search__field {
/deep/ .ant-select-search__field {
display: none !important;
}
}
}
</style>

2
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue
View File

@ -43,4 +43,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue
View File

@ -34,4 +34,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue
View File

@ -35,4 +35,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue
View File

@ -33,7 +33,7 @@
}
</script>
<style lang="scss">
<style lang="less">
/*
* The following styles are auto-applied to elements with

2
ant-design-vue-jeecg/src/components/layouts/PageView.vue
View File

@ -60,7 +60,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.extra-img {
margin-top: -60px;
text-align: center;

2
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
View File

@ -49,7 +49,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
#userLayout.user-layout-wrapper {
height: 100%;

10
ant-design-vue-jeecg/src/components/menu/SideMenu.vue
View File

@ -72,18 +72,18 @@
}
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
/* update_begin author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
.sider {
$scrollBarSize: 10px;
@scrollBarSize: 10px;
ul.ant-menu {
/* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
&::-webkit-scrollbar {
width: $scrollBarSize;
height: $scrollBarSize;
width: @scrollBarSize;
height: @scrollBarSize;
background-color: transparent;
display: none;
}
@ -109,7 +109,7 @@
/* 定义滑块 */
&::-webkit-scrollbar-thumb {
border-radius: $scrollBarSize;
border-radius: @scrollBarSize;
background-color: #eee;
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);

2
ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
View File

@ -22,7 +22,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.footer {
padding: 0 16px;
margin: 48px 0 24px;

2
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
View File

@ -174,7 +174,7 @@
</script>
<style lang="scss">
<style lang="less">
body {
// 打开滚动条固定显示
overflow-y: scroll;

2
ant-design-vue-jeecg/src/components/page/PageHeader.vue
View File

@ -100,7 +100,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.page-header {
background: #fff;

2
ant-design-vue-jeecg/src/components/page/PageLayout.vue
View File

@ -84,7 +84,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.content {
margin: 24px 24px 0;

2
ant-design-vue-jeecg/src/components/page/SHeaderNotice.vue
View File

@ -47,7 +47,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.header-notice{
display: inline-block;
transition: all 0.3s;

2
ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
View File

@ -255,7 +255,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.setting-drawer-index-content {

2
ant-design-vue-jeecg/src/components/setting/SettingItem.vue
View File

@ -22,7 +22,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.setting-drawer-index-item {
margin-bottom: 24px;

2
ant-design-vue-jeecg/src/components/tools/DetailList.vue
View File

@ -77,7 +77,7 @@
}
</script>
<style lang="scss">
<style lang="less">
.detail-list {

2
ant-design-vue-jeecg/src/components/tools/FooterToolBar.vue
View File

@ -15,7 +15,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.toolbar {
position: fixed;
width: 100%;

2
ant-design-vue-jeecg/src/components/tools/HeadInfo.vue
View File

@ -30,7 +30,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.head-info {
position: relative;
text-align: left;

2
ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
View File

@ -324,7 +324,7 @@
top: 50px !important;
}
</style>
<style lang="scss" scoped>
<style lang="less" scoped>
.header-notice{
display: inline-block;
transition: all 0.3s;

2
ant-design-vue-jeecg/src/components/tools/TwoStepCaptcha.vue
View File

@ -80,7 +80,7 @@ export default {
}
};
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.step-form-wrapper {
margin: 0 auto;
width: 80%;

14
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
View File

@ -221,25 +221,21 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
.user-wrapper .search-input {
width: 180px;
color: inherit;
/deep/ {
.ant-select-selection {
/deep/ .ant-select-selection {
background-color: inherit;
border: 0;
border-bottom: 1px solid white;
&__placeholder, &__field__placeholder {
color: inherit;
}
}
.ant-select-selection__placeholder,
.ant-select-search__field__placeholder {
color: inherit;
}
}
}
/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/

8
ant-design-vue-jeecg/src/main.js
View File

@ -18,8 +18,12 @@ import VueApexCharts from 'vue-apexcharts'
import preview from 'vue-photo-preview'
import 'vue-photo-preview/dist/skin.css'
import "@jeecg/antd-online-214"
import '@jeecg/antd-online-214/dist/OnlineForm.css'
// import "@jeecg/antd-online-214"
// import '@jeecg/antd-online-214/dist/OnlineForm.css'
if (process.env.NODE_ENV !== 'production') {
require('@jeecg/antd-online-214')
require('@jeecg/antd-online-214/dist/OnlineForm.css')
}
import {
ACCESS_TOKEN,

2
ant-design-vue-jeecg/src/views/account/center/Index.vue
View File

@ -180,7 +180,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.page-header-wrapper-grid-content-main {
width: 100%;
height: 100%;

2
ant-design-vue-jeecg/src/views/account/center/page/App.vue
View File

@ -79,7 +79,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.app-list {

2
ant-design-vue-jeecg/src/views/account/settings/AvatarModal.vue
View File

@ -83,7 +83,7 @@
};
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.avatar-upload-preview {
position: absolute;

2
ant-design-vue-jeecg/src/views/account/settings/BaseSetting.vue
View File

@ -103,7 +103,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.avatar-upload-wrapper {
height: 200px;

2
ant-design-vue-jeecg/src/views/account/settings/Index.vue
View File

@ -106,7 +106,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.account-settings-info-main {
width: 100%;
display: flex;

2
ant-design-vue-jeecg/src/views/dashboard/IndexBdc.vue
View File

@ -446,7 +446,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.extra-wrapper {
line-height: 55px;
padding-right: 24px;

2
ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue
View File

@ -218,7 +218,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.circle-cust{
position: relative;
top: 28px;

2
ant-design-vue-jeecg/src/views/dashboard/Workplace.vue
View File

@ -245,7 +245,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.project-list {
.card-title {

2
ant-design-vue-jeecg/src/views/exception/ExceptionPage.vue
View File

@ -37,7 +37,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.exception {
min-height: 500px;
height: 80%;

2
ant-design-vue-jeecg/src/views/form/advancedForm/AdvancedForm.vue
View File

@ -199,7 +199,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.card{
margin-bottom: 24px;
}

2
ant-design-vue-jeecg/src/views/form/stepForm/Step2.vue
View File

@ -69,7 +69,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.stepFormText {
margin-bottom: 24px;

2
ant-design-vue-jeecg/src/views/form/stepForm/Step3.vue
View File

@ -52,7 +52,7 @@
}
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.information {
line-height: 22px;

2
ant-design-vue-jeecg/src/views/form/stepForm/StepForm.vue
View File

@ -54,7 +54,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.steps {
max-width: 750px;
margin: 16px auto;

4
ant-design-vue-jeecg/src/views/jeecg/modules/VueCronModal.vue
View File

@ -630,7 +630,7 @@
}
</script>
<style lang="scss">
<style lang="less">
.card-container {
background: #fff;
overflow: hidden;
@ -678,7 +678,7 @@
}
}
</style>
<style lang="scss" scoped>
<style lang="less" scoped>
.container-widthEn{
width: 755px;
}

2
ant-design-vue-jeecg/src/views/jeecg/report/Analysis.vue
View File

@ -625,7 +625,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.extra-wrapper {
line-height: 55px;
padding-right: 24px;

2
ant-design-vue-jeecg/src/views/list/CardList.vue
View File

@ -59,7 +59,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.card-avatar {
width: 48px;
height: 48px;

2
ant-design-vue-jeecg/src/views/list/StandardList.vue
View File

@ -139,7 +139,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.ant-avatar-lg {
width: 48px;
height: 48px;

2
ant-design-vue-jeecg/src/views/list/TableInnerEditList.vue
View File

@ -248,7 +248,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.search {
margin-bottom: 54px;
}

2
ant-design-vue-jeecg/src/views/list/search/SearchLayout.vue
View File

@ -63,7 +63,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.search-head{
background-color: #fff;
margin: -25px -24px -24px;

41
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/ButtonExpHandler.js Normal file
View File

@ -0,0 +1,41 @@
/**
* online 自定义按钮表达式处理类
*/
export default class ButtonExpHandler {
/**
* 构造器
* @param express
*/
constructor(express,record) {
this._express = express;
this._record = record;
}
get show() {
if(!this._express || this._express==''){
return true;
}
let arr = this._express.split('#');
//获取字段值
let fieldValue = this._record[arr[0]];
//获取表达式
let exp = arr[1].toLowerCase();
//判断表达式
if(exp === 'eq'){
return fieldValue == arr[2];
}else if(exp === 'ne'){
return !(fieldValue == arr[2]);
}else if(exp === 'empty'){
if(arr[2]==='true' || arr[2]===true){
return !fieldValue || fieldValue=='';
}else{
return fieldValue && fieldValue.length>0
}
}else if(exp === 'in'){
let arr2 = arr[2].split(',');
return arr2.indexOf(String(fieldValue))>=0;
}
return false;
}
}

1
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
View File

@ -209,6 +209,7 @@
import { cloneObject, filterObj } from '@/utils/util'
import JImportModal from '@/components/jeecg/JImportModal'
import JSuperQuery from '@comp/jeecg/JSuperQuery'
import ButtonExpHandler from './ButtonExpHandler'
export default {
name: 'OnlCgFormAutoList',

2
ant-design-vue-jeecg/src/views/profile/advanced/Advanced.vue
View File

@ -300,7 +300,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.detail-layout {
margin-left: 44px;

2
ant-design-vue-jeecg/src/views/profile/basic/Index.vue
View File

@ -245,7 +245,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.title {
color: rgba(0,0,0,.85);
font-size: 16px;

2
ant-design-vue-jeecg/src/views/result/Result.vue
View File

@ -39,7 +39,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.result {
text-align: center;
width: 72%;

2
ant-design-vue-jeecg/src/views/system/modules/DeptRoleAuthModal.vue
View File

@ -201,7 +201,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.drawer-bootom-button {
position: absolute;
bottom: 0;

2
ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleModal.vue
View File

@ -376,4 +376,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
View File

@ -55,4 +55,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue
View File

@ -224,4 +224,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
View File

@ -188,4 +188,4 @@
}
</script>
<style lang="scss" scoped></style>
<style lang="less" scoped></style>

2
ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue
View File

@ -184,7 +184,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.drawer-bootom-button {
position: absolute;
bottom: 0;

2
ant-design-vue-jeecg/src/views/user/Alteration.vue
View File

@ -60,7 +60,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.steps {
max-width: 750px;
margin: 16px auto;

2
ant-design-vue-jeecg/src/views/user/Login.vue
View File

@ -486,7 +486,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.user-layout-login {
label {

4
ant-design-vue-jeecg/src/views/user/Register.vue
View File

@ -318,7 +318,7 @@
}
}
</script>
<style lang="scss">
<style lang="less">
.user-register {
&.error {
@ -341,7 +341,7 @@
}
}
</style>
<style lang="scss" scoped>
<style lang="less" scoped>
.user-layout-register {
& > h3 {

2
ant-design-vue-jeecg/src/views/user/Step2.vue
View File

@ -184,7 +184,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.stepFormText {
margin-bottom: 24px;
}

2
ant-design-vue-jeecg/src/views/user/Step3.vue
View File

@ -119,7 +119,7 @@
}
}
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.stepFormText {
margin-bottom: 24px;
}