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

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

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%;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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;
}

View File

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

View File

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

View File

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

View File

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

View File

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

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;
}
}

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',

View File

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

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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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 {

View File

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

View File

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