Skip to content

Commit 16a44a4

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java # yudao-server/pom.xml # yudao-server/src/main/resources/application-local.yaml # yudao-server/src/main/resources/application.yaml # yudao-ui-admin/src/views/mall/CouponTemplete/index.vue # yudao-ui-admin/src/views/mall/product/property/index.vue # yudao-ui-admin/src/views/mall/product/spu/index.vue # yudao-ui-admin/src/views/mall/product/spu/save.vue # yudao-ui-admin/src/views/system/role/index.vue
2 parents 5373b44 + 5e5c761 commit 16a44a4

File tree

146 files changed

+2994
-3347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2994
-3347
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ module.exports = {
1515
// add your custom rules here
1616
//it is base on https://github.com/vuejs/eslint-config-vue
1717
rules: {
18-
"vue/max-attributes-per-line": [2, {
19-
"singleline": 10,
20-
"multiline": {
21-
"max": 1,
22-
"allowFirstLine": false
23-
}
24-
}],
2518
"vue/singleline-html-element-content-newline": "off",
2619
"vue/multiline-html-element-content-newline":"off",
2720
"vue/name-property-casing": ["error", "PascalCase"],

‎build/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
1212
const port = 9526
1313
const publicPath = config.publicPath
1414

15-
var connect = require('connect')
16-
var serveStatic = require('serve-static')
15+
const connect = require('connect')
16+
const serveStatic = require('serve-static')
1717
const app = connect()
1818

1919
app.use(

‎package.json

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,67 +40,65 @@
4040
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
4141
},
4242
"dependencies": {
43+
"@babel/parser": "7.18.4",
4344
"@riophae/vue-treeselect": "0.4.0",
44-
"axios": "0.24.0",
45+
"axios": "0.27.2",
46+
"bpmn-js-token-simulation": "0.10.0",
4547
"clipboard": "2.0.8",
46-
"core-js": "^3.21.1",
48+
"core-js": "^3.26.0",
49+
"crypto-js": "^4.0.0",
4750
"echarts": "4.9.0",
48-
"element-ui": "2.15.8",
51+
"element-ui": "2.15.10",
4952
"file-saver": "2.0.5",
50-
"fuse.js": "6.4.3",
53+
"fuse.js": "6.6.2",
5154
"highlight.js": "9.18.5",
5255
"js-beautify": "1.13.0",
53-
"jsencrypt": "3.0.0-rc.1",
54-
"crypto-js": "^4.0.0",
56+
"jsencrypt": "3.3.1",
57+
"min-dash": "3.5.2",
5558
"nprogress": "0.2.0",
5659
"quill": "1.3.7",
5760
"screenfull": "5.0.2",
5861
"sortablejs": "1.10.2",
59-
"vue": "2.6.12",
62+
"throttle-debounce": "2.1.0",
63+
"vue": "2.7.0",
6064
"vue-count-to": "1.0.13",
61-
"vue-cropper": "0.5.5",
65+
"vue-cropper": "0.5.8",
6266
"vue-meta": "^2.4.0",
6367
"vue-router": "3.4.9",
6468
"vuedraggable": "2.24.3",
65-
"vuex": "3.6.0",
66-
"bpmn-js-token-simulation": "0.10.0",
67-
"min-dash": "3.5.2",
68-
"xml-js": "1.6.11",
69-
"@babel/parser": "7.7.4",
70-
"throttle-debounce": "2.1.0"
69+
"vuex": "3.6.2",
70+
"xml-js": "1.6.11"
7171
},
7272
"devDependencies": {
73-
"@vue/cli-plugin-babel": "4.4.6",
74-
"@vue/cli-plugin-eslint": "4.4.6",
75-
"@vue/cli-service": "4.4.6",
73+
"@vue/cli-plugin-babel": "4.5.18",
74+
"@vue/cli-plugin-eslint": "4.5.18",
75+
"@vue/cli-service": "4.5.18",
76+
"@vue/compiler-sfc": "^3.0.1",
77+
"@vue/eslint-config-prettier": "^5.0.0",
7678
"babel-eslint": "10.1.0",
79+
"bpmn-js": "8.9.0",
80+
"bpmn-js-properties-panel": "0.46.0",
7781
"chalk": "4.1.0",
7882
"compression-webpack-plugin": "5.0.2",
7983
"connect": "3.6.6",
8084
"eslint": "7.15.0",
81-
"eslint-plugin-vue": "7.2.0",
82-
"lint-staged": "10.5.3",
83-
"sass": "1.32.13",
85+
"eslint-config-airbnb-base": "^14.0.0",
86+
"eslint-plugin-import": "^2.26.0",
87+
"eslint-plugin-prettier": "^3.1.0",
88+
"eslint-plugin-vue": "9.0.0",
89+
"fs-extra": "^8.1.0",
90+
"lint-staged": "12.5.0",
8491
"runjs": "4.4.2",
85-
"sass-loader": "10.1.1",
92+
"sass": "1.3.0",
93+
"sass-loader": "10.2.0",
8694
"script-ext-html-webpack-plugin": "2.1.5",
8795
"svg-sprite-loader": "5.1.1",
88-
"vue-template-compiler": "2.6.12",
89-
"vue2-ace-editor": "^0.0.15",
90-
"@vue/compiler-sfc": "^3.0.1",
91-
"@vue/eslint-config-prettier": "^5.0.0",
92-
"bpmn-js": "8.9.0",
93-
"bpmn-js-properties-panel": "0.46.0",
94-
"eslint-plugin-prettier": "^3.1.0",
95-
"fs-extra": "^8.1.0",
9696
"terser-webpack-plugin": "^4.2.3",
97-
"webpack-bundle-analyzer": "^3.9.0",
98-
"eslint-config-airbnb-base": "^14.0.0",
99-
"eslint-plugin-import": "^2.20.0"
97+
"webpack-bundle-analyzer": "^3.9.0"
10098
},
10199
"engines": {
102-
"node": ">=8.9",
103-
"npm": ">= 3.0.0"
100+
"node": ">= 10.13.0",
101+
"npm": ">= 5.0.0"
104102
},
105103
"browserslist": [
106104
"> 1%",

‎src/App.vue

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<template>
22
<div id="app">
33
<router-view />
4+
<theme-picker />
45
</div>
56
</template>
67

78
<script>
8-
export default {
9-
name: 'App',
9+
import ThemePicker from "@/components/ThemePicker";
10+
11+
export default {
12+
name: "App",
13+
components: { ThemePicker },
1014
metaInfo() {
1115
return {
1216
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@@ -15,5 +19,10 @@ export default {
1519
}
1620
}
1721
}
18-
}
22+
};
1923
</script>
24+
<style scoped>
25+
#app .theme-picker {
26+
display: none;
27+
}
28+
</style>

‎src/assets/icons/svg/code.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/icons/svg/rich-text.svg renamed to ‎src/assets/icons/svg/rich-text.svg

File renamed without changes.

‎src/assets/icons/svg/server.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/icons/svg/system.svg

Lines changed: 2 additions & 1 deletion
Loading

‎src/assets/icons/svg/tool.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/styles/ruoyi.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,8 @@
145145
}
146146

147147
/** 表格更多操作下拉样式 */
148-
.el-table .el-dropdown-link {
148+
.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
149149
cursor: pointer;
150-
color: #409EFF;
151150
margin-left: 5px;
152151
}
153152

0 commit comments

Comments
 (0)