Skip to content

J
jeecg-boot

weixin_54676683 / jeecg-boot
与 Fork 源项目一致

Fork自 jeecg / jeecg-boot

通知 1
Star 0
Fork 1
J
jeecg-boot

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 91594ddb 编写于 作者: JEECG低代码平台's avatar JEECG低代码平台
浏览文件
操作

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

2.online开发ButtonExpHandler is not defined #957；
3.关于打包后JS文件过大，导致加载缓慢的建议 #969
上级 4c0c0945
展开全部 隐藏空白更改
内联 并排
Showing with 297 addition and 463 deletion
ant-design-vue-jeecg/idea.config.js
浏览文件 @ 91594ddb
...@@ -6,19 +6,19 @@ function resolve (dir) { ...@@ -6,19 +6,19 @@ function resolve (dir) {
} }
module.exports = { module.exports = {
context: path.resolve(__dirname, './'), context: path.resolve(__dirname, './'),
resolve: { resolve: {
extensions: ['.js', '.vue', '.json'], extensions: ['.js', '.vue', '.json'],
alias: { alias: {
'config': resolve('config'), 'config': resolve('config'),
'@': resolve('src'), '@': resolve('src'),
'@views': resolve('src/views'), '@views': resolve('src/views'),
'@comp': resolve('src/components'), '@comp': resolve('src/components'),
'@core': resolve('src/core'), '@core': resolve('src/core'),
'@utils': resolve('src/utils'), '@utils': resolve('src/utils'),
'@entry': resolve('src/entry'), '@entry': resolve('src/entry'),
'@router': resolve('src/router'), '@router': resolve('src/router'),
'@store': resolve('src/store') '@store': resolve('src/store')
} }
}, }
} }
\ No newline at end of file
ant-design-vue-jeecg/package.json
浏览文件 @ 91594ddb
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
"html-webpack-plugin": "^4.0.0-beta.11", "html-webpack-plugin": "^4.0.0-beta.11",
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"node-sass": "^4.13.1",
"sass-loader": "^7.3.1",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
}, },
"eslintConfig": { "eslintConfig": {
...@@ -65,7 +63,7 @@ ...@@ -65,7 +63,7 @@
}, },
"extends": [ "extends": [
"plugin:vue/strongly-recommended", "plugin:vue/strongly-recommended",
"eslint:recommended" "@vue/standard"
], ],
"parserOptions": { "parserOptions": {
"parser": "babel-eslint" "parser": "babel-eslint"
...@@ -93,7 +91,9 @@ ...@@ -93,7 +91,9 @@
"vue/no-use-v-if-with-v-for": 0, "vue/no-use-v-if-with-v-for": 0,
"vue/html-closing-bracket-newline": 0, "vue/html-closing-bracket-newline": 0,
"vue/no-parsing-error": 0, "vue/no-parsing-error": 0,
"no-console": 0 "no-console": 0,
"no-tabs": 0,
"indent": [1, 4]
} }
}, },
"postcss": { "postcss": {
...@@ -104,6 +104,6 @@ ...@@ -104,6 +104,6 @@
"browserslist": [ "browserslist": [
"> 1%", "> 1%",
"last 2 versions", "last 2 versions",
"not ie <= 8" "not ie <= 10"
] ]
} }
ant-design-vue-jeecg/src/components/ChartCard.vue
浏览文件 @ 91594ddb
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.chart-card-header { .chart-card-header {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
......
ant-design-vue-jeecg/src/components/chart/AreaChartTy.vue
浏览文件 @ 91594ddb
...@@ -83,6 +83,6 @@ ...@@ -83,6 +83,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
@import "chart"; @import "chart";
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/chart/MiniArea.vue
浏览文件 @ 91594ddb
...@@ -64,6 +64,6 @@ ...@@ -64,6 +64,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
@import "chart"; @import "chart";
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/chart/MiniBar.vue
浏览文件 @ 91594ddb
...@@ -71,6 +71,6 @@ ...@@ -71,6 +71,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
@import "chart"; @import "chart";
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/chart/MiniProgress.vue
浏览文件 @ 91594ddb
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.chart-mini-progress { .chart-mini-progress {
padding: 5px 0; padding: 5px 0;
position: relative; position: relative;
......
ant-design-vue-jeecg/src/components/chart/RankList.vue
浏览文件 @ 91594ddb
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.rank { .rank {
padding: 0 32px 32px 72px; padding: 0 32px 32px 72px;
......
ant-design-vue-jeecg/src/components/chart/Trend.vue
浏览文件 @ 91594ddb
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.chart-trend { .chart-trend {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
......
ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
浏览文件 @ 91594ddb
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="less">
.j-modal-box { .j-modal-box {
&.fullscreen { &.fullscreen {
...@@ -180,8 +180,5 @@ ...@@ -180,8 +180,5 @@
} }
} }
/deep/ {
}
} }
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
浏览文件 @ 91594ddb
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.j-super-query-box { .j-super-query-box {
display: inline-block; display: inline-block;
......
ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
浏览文件 @ 91594ddb
...@@ -829,7 +829,7 @@ ...@@ -829,7 +829,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="less">
.card-container { .card-container {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang="less" scoped>
.container-widthEn{ .container-widthEn{
width: 755px; width: 755px;
} }
......
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/index.vue
浏览文件 @ 91594ddb
...@@ -132,27 +132,25 @@ ...@@ -132,27 +132,25 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.j-select-biz-component-box { .j-select-biz-component-box {
$width: 82px; @width: 82px;
.left { .left {
width: calc(100% - #{$width} - 8px); width: calc(100% - @width - 8px);
} }
.right { .right {
width: #{$width}; width: @width ;
} }
.full { .full {
width: 100%; width: 100%;
} }
/deep/ { /deep/ .ant-select-search__field {
.ant-select-search__field {
display: none !important; display: none !important;
} }
}
} }
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue
浏览文件 @ 91594ddb
...@@ -43,4 +43,4 @@ ...@@ -43,4 +43,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue
浏览文件 @ 91594ddb
...@@ -34,4 +34,4 @@ ...@@ -34,4 +34,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue
浏览文件 @ 91594ddb
...@@ -35,4 +35,4 @@ ...@@ -35,4 +35,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue
浏览文件 @ 91594ddb
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="less">
/* /*
* The following styles are auto-applied to elements with * The following styles are auto-applied to elements with
......
ant-design-vue-jeecg/src/components/layouts/PageView.vue
浏览文件 @ 91594ddb
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.extra-img { .extra-img {
margin-top: -60px; margin-top: -60px;
text-align: center; text-align: center;
......
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
浏览文件 @ 91594ddb
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
#userLayout.user-layout-wrapper { #userLayout.user-layout-wrapper {
height: 100%; height: 100%;
......
ant-design-vue-jeecg/src/components/menu/SideMenu.vue
浏览文件 @ 91594ddb
...@@ -72,18 +72,18 @@ ...@@ -72,18 +72,18 @@
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
/* update_begin author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */ /* update_begin author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
.sider { .sider {
$scrollBarSize: 10px; @scrollBarSize: 10px;
ul.ant-menu { ul.ant-menu {
/* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/ /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: $scrollBarSize; width: @scrollBarSize;
height: $scrollBarSize; height: @scrollBarSize;
background-color: transparent; background-color: transparent;
display: none; display: none;
} }
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
/* 定义滑块 */ /* 定义滑块 */
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
border-radius: $scrollBarSize; border-radius: @scrollBarSize;
background-color: #eee; background-color: #eee;
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
......
ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
浏览文件 @ 91594ddb
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.footer { .footer {
padding: 0 16px; padding: 0 16px;
margin: 48px 0 24px; margin: 48px 0 24px;
......
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
浏览文件 @ 91594ddb
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</script> </script>
<style lang="scss"> <style lang="less">
body { body {
// 打开滚动条固定显示 // 打开滚动条固定显示
overflow-y: scroll; overflow-y: scroll;
......
ant-design-vue-jeecg/src/components/page/PageHeader.vue
浏览文件 @ 91594ddb
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.page-header { .page-header {
background: #fff; background: #fff;
......
ant-design-vue-jeecg/src/components/page/PageLayout.vue
浏览文件 @ 91594ddb
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.content { .content {
margin: 24px 24px 0; margin: 24px 24px 0;
......
ant-design-vue-jeecg/src/components/page/SHeaderNotice.vue
浏览文件 @ 91594ddb
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.header-notice{ .header-notice{
display: inline-block; display: inline-block;
transition: all 0.3s; transition: all 0.3s;
......
ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
浏览文件 @ 91594ddb
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.setting-drawer-index-content { .setting-drawer-index-content {
......
ant-design-vue-jeecg/src/components/setting/SettingItem.vue
浏览文件 @ 91594ddb
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.setting-drawer-index-item { .setting-drawer-index-item {
margin-bottom: 24px; margin-bottom: 24px;
......
ant-design-vue-jeecg/src/components/tools/DetailList.vue
浏览文件 @ 91594ddb
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="less">
.detail-list { .detail-list {
......
ant-design-vue-jeecg/src/components/tools/FooterToolBar.vue
浏览文件 @ 91594ddb
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.toolbar { .toolbar {
position: fixed; position: fixed;
width: 100%; width: 100%;
......
ant-design-vue-jeecg/src/components/tools/HeadInfo.vue
浏览文件 @ 91594ddb
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.head-info { .head-info {
position: relative; position: relative;
text-align: left; text-align: left;
......
ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
浏览文件 @ 91594ddb
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
top: 50px !important; top: 50px !important;
} }
</style> </style>
<style lang="scss" scoped> <style lang="less" scoped>
.header-notice{ .header-notice{
display: inline-block; display: inline-block;
transition: all 0.3s; transition: all 0.3s;
......
ant-design-vue-jeecg/src/components/tools/TwoStepCaptcha.vue
浏览文件 @ 91594ddb
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.step-form-wrapper { .step-form-wrapper {
margin: 0 auto; margin: 0 auto;
width: 80%; width: 80%;
......
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
浏览文件 @ 91594ddb
...@@ -221,25 +221,21 @@ ...@@ -221,25 +221,21 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/ /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */ /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
.user-wrapper .search-input { .user-wrapper .search-input {
width: 180px; width: 180px;
color: inherit; color: inherit;
/deep/ { /deep/ .ant-select-selection {
.ant-select-selection {
background-color: inherit; background-color: inherit;
border: 0; border: 0;
border-bottom: 1px solid white; 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:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/ /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
......
ant-design-vue-jeecg/src/main.js
浏览文件 @ 91594ddb
...@@ -18,8 +18,12 @@ import VueApexCharts from 'vue-apexcharts' ...@@ -18,8 +18,12 @@ import VueApexCharts from 'vue-apexcharts'
import preview from 'vue-photo-preview' import preview from 'vue-photo-preview'
import 'vue-photo-preview/dist/skin.css' import 'vue-photo-preview/dist/skin.css'
import "@jeecg/antd-online-214" // import "@jeecg/antd-online-214"
import '@jeecg/antd-online-214/dist/OnlineForm.css' // 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 { import {
ACCESS_TOKEN, ACCESS_TOKEN,
......
ant-design-vue-jeecg/src/views/account/center/Index.vue
浏览文件 @ 91594ddb
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.page-header-wrapper-grid-content-main { .page-header-wrapper-grid-content-main {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
ant-design-vue-jeecg/src/views/account/center/page/App.vue
浏览文件 @ 91594ddb
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.app-list { .app-list {
......
ant-design-vue-jeecg/src/views/account/settings/AvatarModal.vue
浏览文件 @ 91594ddb
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
}; };
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.avatar-upload-preview { .avatar-upload-preview {
position: absolute; position: absolute;
......
ant-design-vue-jeecg/src/views/account/settings/BaseSetting.vue
浏览文件 @ 91594ddb
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.avatar-upload-wrapper { .avatar-upload-wrapper {
height: 200px; height: 200px;
......
ant-design-vue-jeecg/src/views/account/settings/Index.vue
浏览文件 @ 91594ddb
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.account-settings-info-main { .account-settings-info-main {
width: 100%; width: 100%;
display: flex; display: flex;
......
ant-design-vue-jeecg/src/views/dashboard/IndexBdc.vue
浏览文件 @ 91594ddb
...@@ -446,7 +446,7 @@ ...@@ -446,7 +446,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.extra-wrapper { .extra-wrapper {
line-height: 55px; line-height: 55px;
padding-right: 24px; padding-right: 24px;
......
ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue
浏览文件 @ 91594ddb
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.circle-cust{ .circle-cust{
position: relative; position: relative;
top: 28px; top: 28px;
......
ant-design-vue-jeecg/src/views/dashboard/Workplace.vue
浏览文件 @ 91594ddb
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.project-list { .project-list {
.card-title { .card-title {
......
ant-design-vue-jeecg/src/views/exception/ExceptionPage.vue
浏览文件 @ 91594ddb
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.exception { .exception {
min-height: 500px; min-height: 500px;
height: 80%; height: 80%;
......
ant-design-vue-jeecg/src/views/form/advancedForm/AdvancedForm.vue
浏览文件 @ 91594ddb
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.card{ .card{
margin-bottom: 24px; margin-bottom: 24px;
} }
......
ant-design-vue-jeecg/src/views/form/stepForm/Step2.vue
浏览文件 @ 91594ddb
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.stepFormText { .stepFormText {
margin-bottom: 24px; margin-bottom: 24px;
......
ant-design-vue-jeecg/src/views/form/stepForm/Step3.vue
浏览文件 @ 91594ddb
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.information { .information {
line-height: 22px; line-height: 22px;
......
ant-design-vue-jeecg/src/views/form/stepForm/StepForm.vue
浏览文件 @ 91594ddb
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.steps { .steps {
max-width: 750px; max-width: 750px;
margin: 16px auto; margin: 16px auto;
......
ant-design-vue-jeecg/src/views/jeecg/modules/VueCronModal.vue
浏览文件 @ 91594ddb
...@@ -630,7 +630,7 @@ ...@@ -630,7 +630,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="less">
.card-container { .card-container {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang="less" scoped>
.container-widthEn{ .container-widthEn{
width: 755px; width: 755px;
} }
......
ant-design-vue-jeecg/src/views/jeecg/report/Analysis.vue
浏览文件 @ 91594ddb
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.extra-wrapper { .extra-wrapper {
line-height: 55px; line-height: 55px;
padding-right: 24px; padding-right: 24px;
......
ant-design-vue-jeecg/src/views/list/CardList.vue
浏览文件 @ 91594ddb
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.card-avatar { .card-avatar {
width: 48px; width: 48px;
height: 48px; height: 48px;
......
ant-design-vue-jeecg/src/views/list/StandardList.vue
浏览文件 @ 91594ddb
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.ant-avatar-lg { .ant-avatar-lg {
width: 48px; width: 48px;
height: 48px; height: 48px;
......
ant-design-vue-jeecg/src/views/list/TableInnerEditList.vue
浏览文件 @ 91594ddb
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.search { .search {
margin-bottom: 54px; margin-bottom: 54px;
} }
......
ant-design-vue-jeecg/src/views/list/search/SearchLayout.vue
浏览文件 @ 91594ddb
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.search-head{ .search-head{
background-color: #fff; background-color: #fff;
margin: -25px -24px -24px; margin: -25px -24px -24px;
......
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/ButtonExpHandler.js 0 → 100644
浏览文件 @ 91594ddb
/**
* 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;
}
}
\ No newline at end of file
ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
浏览文件 @ 91594ddb
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
import { cloneObject, filterObj } from '@/utils/util' import { cloneObject, filterObj } from '@/utils/util'
import JImportModal from '@/components/jeecg/JImportModal' import JImportModal from '@/components/jeecg/JImportModal'
import JSuperQuery from '@comp/jeecg/JSuperQuery' import JSuperQuery from '@comp/jeecg/JSuperQuery'
import ButtonExpHandler from './ButtonExpHandler'
export default { export default {
name: 'OnlCgFormAutoList', name: 'OnlCgFormAutoList',
......
ant-design-vue-jeecg/src/views/profile/advanced/Advanced.vue
浏览文件 @ 91594ddb
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.detail-layout { .detail-layout {
margin-left: 44px; margin-left: 44px;
......
ant-design-vue-jeecg/src/views/profile/basic/Index.vue
浏览文件 @ 91594ddb
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.title { .title {
color: rgba(0,0,0,.85); color: rgba(0,0,0,.85);
font-size: 16px; font-size: 16px;
......
ant-design-vue-jeecg/src/views/result/Result.vue
浏览文件 @ 91594ddb
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.result { .result {
text-align: center; text-align: center;
width: 72%; width: 72%;
......
ant-design-vue-jeecg/src/views/system/modules/DeptRoleAuthModal.vue
浏览文件 @ 91594ddb
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
......
ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleModal.vue
浏览文件 @ 91594ddb
...@@ -376,4 +376,4 @@ ...@@ -376,4 +376,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
浏览文件 @ 91594ddb
...@@ -55,4 +55,4 @@ ...@@ -55,4 +55,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue
浏览文件 @ 91594ddb
...@@ -224,4 +224,4 @@ ...@@ -224,4 +224,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
浏览文件 @ 91594ddb
...@@ -188,4 +188,4 @@ ...@@ -188,4 +188,4 @@
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped></style>
\ No newline at end of file \ No newline at end of file
ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue
浏览文件 @ 91594ddb
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
......
ant-design-vue-jeecg/src/views/user/Alteration.vue
浏览文件 @ 91594ddb
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.steps { .steps {
max-width: 750px; max-width: 750px;
margin: 16px auto; margin: 16px auto;
......
ant-design-vue-jeecg/src/views/user/Login.vue
浏览文件 @ 91594ddb
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.user-layout-login { .user-layout-login {
label { label {
......
ant-design-vue-jeecg/src/views/user/Register.vue
浏览文件 @ 91594ddb
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
} }
} }
</script> </script>
<style lang="scss"> <style lang="less">
.user-register { .user-register {
&.error { &.error {
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang="less" scoped>
.user-layout-register { .user-layout-register {
& > h3 { & > h3 {
......
ant-design-vue-jeecg/src/views/user/Step2.vue
浏览文件 @ 91594ddb
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.stepFormText { .stepFormText {
margin-bottom: 24px; margin-bottom: 24px;
} }
......
ant-design-vue-jeecg/src/views/user/Step3.vue
浏览文件 @ 91594ddb
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="less" scoped>
.stepFormText { .stepFormText {
margin-bottom: 24px; margin-bottom: 24px;
} }
......
ant-design-vue-jeecg/vue.config.js
浏览文件 @ 91594ddb
const path = require('path') const path = require('path')
function resolve(dir) { function resolve (dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
...@@ -14,10 +14,10 @@ module.exports = { ...@@ -14,10 +14,10 @@ module.exports = {
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false, productionSourceMap: false,
//打包app时放开该配置 // 打包app时放开该配置
//publicPath:'./', // publicPath:'./',
configureWebpack: config => { configureWebpack: config => {
//生产环境取消 console.log // 生产环境取消 console.log
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
} }
...@@ -47,9 +47,9 @@ module.exports = { ...@@ -47,9 +47,9 @@ module.exports = {
/* less 变量覆盖，用于自定义 ant design 主题 */ /* less 变量覆盖，用于自定义 ant design 主题 */
'primary-color': '#1890FF', 'primary-color': '#1890FF',
'link-color': '#1890FF', 'link-color': '#1890FF',
'border-radius-base': '4px', 'border-radius-base': '4px'
}, },
javascriptEnabled: true, javascriptEnabled: true
} }
} }
}, },
...@@ -57,21 +57,21 @@ module.exports = { ...@@ -57,21 +57,21 @@ module.exports = {
devServer: { devServer: {
port: 3000, port: 3000,
proxy: { proxy: {
/* '/api': { /* '/api': {
target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统 target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'/jeecg-boot': '' //默认所有请求都加了jeecg-boot前缀，需要去掉 '/jeecg-boot': '' //默认所有请求都加了jeecg-boot前缀，需要去掉
} }
},*/ }, */
'/jeecg-boot': { '/jeecg-boot': {
target: 'http://localhost:8080', //请求本地 需要jeecg-boot后台项目 target: 'http://127.0.0.1:8080', // 请求本地 需要jeecg-boot后台项目
ws: false, ws: false,
changeOrigin: true changeOrigin: true
}, }
} }
}, },
lintOnSave: undefined lintOnSave: undefined
} }
\ No newline at end of file
ant-design-vue-jeecg/yarn.lock
浏览文件 @ 91594ddb
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或