tag 2.10.1 support spring boot 2.3.5

xiejun1995 · Nov 1, 2020 · c0196b7 · c0196b7
1 parent 3529eb4
commit c0196b7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -18,12 +18,12 @@
 
 | 依赖                   | 版本          |
 | ---------------------- | ------------- |
-| Spring Boot            | 2.3.4.RELEASE |
+| Spring Boot            | 2.3.5.RELEASE |
 | Spring Cloud           | Hoxton.SR8    |
 | Spring Cloud Alibaba   | 2.2.3.RELEASE |
 | Spring Security OAuth2 | 2.3.6         |
 | Mybatis Plus           | 3.4.0         |
-| hutool                 | 5.4.4         |
+| hutool                 | 5.4.7         |
 | Avue                   | 2.6.16        |
 
 ### 模块说明
@@ -91,11 +91,16 @@ npm run build:docker && docker-compose up -d
 
 ```xml
 <!-- pig-gen archetype -->
-<dependency>
-    <groupId>com.pig4cloud.archetype</groupId>
-    <artifactId>pig-gen</artifactId>
-    <version>2.10.0</version>
-</dependency>
+# 在空文件夹执行以下命令，注意 windows 下  \ 修改成 ^
+mvn archetype:generate \
+       -DgroupId=com.pig4cloud \
+       -DartifactId=demo \
+       -Dversion=1.0.0-SNAPSHOT \
+       -Dpackage=com.pig4cloud.pig.demo \
+       -DarchetypeGroupId=com.pig4cloud.archetype \
+       -DarchetypeArtifactId=pig-gen \
+       -DarchetypeVersion=2.10.1 \
+       -DarchetypeCatalog=local
 ```
 
 ## 免费公开课

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pig-ui",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",
-    "@smallwei/avue": "2.6.16",
-    "@sscfaith/avue-form-design": "1.3.2",
+    "@smallwei/avue": "2.6.18",
+    "@sscfaith/avue-form-design": "1.3.10",
     "avue-plugin-ueditor": "^0.0.6",
     "axios": "^0.19.0",
     "babel-polyfill": "^6.26.0",
@@ -29,9 +29,8 @@
     "vuex": "^3.1.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.12.1",
-    "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-service": "^3.11.0",
+    "@vue/cli-plugin-babel": "^3.12.0",
+    "@vue/cli-service": "^3.12.0",
     "chai": "^4.2.0",
     "node-sass": "^4.12.0",
     "sass-loader": "^8.0.0",
@@ -47,4 +46,4 @@
       "git add"
     ]
   }
-}
+}
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
@@ -6,7 +6,7 @@
              src="/img/logo.png"
              alt="">
         <p class="title">{{website.infoTitle}}</p>
-        <p>©2020 v2.10.0</p>
+        <p>©2020 v2.10.1</p>
       </div>
       <div class="login-border">
         <div class="login-main">

diff --git a/src/page/wel.vue b/src/page/wel.vue
@@ -4,17 +4,17 @@
       <div class="banner-text">
         <span>
           <a href="https://avue.top/#/pay" target="_blank">
-            <img src="https://img.shields.io/badge/Element-2.13.2-green.svg" alt="Build Status">
+            <img src="https://img.shields.io/badge/Element-2.13.6-green.svg" alt="Build Status">
           </a>
-          <img src="https://img.shields.io/badge/Spring%20Boot-2.3.3.RELEASE-yellowgreen.svg" alt="Downloads">
+          <img src="https://img.shields.io/badge/Spring%20Boot-2.3.5.RELEASE-yellowgreen.svg" alt="Downloads">
           <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR8-blue.svg" alt="Coverage Status">
         </span>
         <br/>
         <span>
           <el-collapse v-model="activeNames">
             <el-collapse-item name="1">
               <div>基于Spring Cloud Hoxton.S8</div>
-              <div>基于Spring Boot 2.3.3.RELEASE</div>
+              <div>基于Spring Boot 2.3.5.RELEASE</div>
             </el-collapse-item>
             <el-collapse-item name="2">
               <div>支持docker部署</div>

diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue
@@ -38,6 +38,7 @@
           <el-button
             v-if="permissions.sys_dict_add"
             type="text"
+            size="small"
             icon="el-icon-menu"
             @click="handleItem(scope.row,scope.index)">字典项
           </el-button>
@@ -168,16 +169,16 @@
         this.itemPage.currentPage = 1
       },
       handleItem: function (row) {
-        this.getDictItemList(row.id, row.type)
+        this.dictId = row.id
+        this.dictType = row.type
+        this.getDictItemList()
       },
-      getDictItemList(dictId, type) {
-        this.dictType = type
-        this.dictId = dictId
+      getDictItemList() {
         this.dialogFormVisible = true
         fetchItemList(Object.assign({
           current: this.itemPage.currentPage,
           size: this.itemPage.pageSize
-        }, {dictId: dictId})).then(response => {
+        }, {dictId: this.dictId})).then(response => {
           this.tableDictItemData = response.data.data.records
           this.itemPage.total = response.data.data.total
         })
@@ -190,24 +191,24 @@
       handleItemSave: function (row, done) {
         addItemObj(row).then(() => {
           this.$message.success('添加成功')
-          this.getDictItemList(row.dictId, row.type)
+          this.getDictItemList()
           done()
         })
       },
       handleItemUpdate: function (row, index, done) {
         putItemObj(row).then(() => {
           this.$message.success('修改成功')
-          this.getDictItemList(row.dictId, row.type)
+          this.getDictItemList()
           done()
         })
       },
       itemSizeChange(pageSize) {
         this.itemPage.pageSize = pageSize
-        this.getDictItemList(this.dictId, this.type)
+        this.getDictItemList()
       },
       itemCurrentChange(current) {
         this.itemPage.currentPage = current
-        this.getDictItemList(this.dictId, this.type)
+        this.getDictItemList()
       },
       rowItemDel: function (row) {
         this.$confirm('是否确认删除数据为"' + row.label + '"的数据项?', '警告', {
@@ -217,11 +218,15 @@
         }).then(function () {
           return delItemObj(row.id)
         }).then(() => {
-          this.getDictItemList(row.dictId, row.type)
+          this.getDictItemList()
           this.$message.success('删除成功')
         }).catch(function () {
         })
       }
     }
   }
 </script>
+
+<style lang="scss" scoped>
+</style>
+
diff --git a/src/views/gen/index.vue b/src/views/gen/index.vue
@@ -71,7 +71,7 @@
           </el-button>
           <el-button
             type="text"
-            icon="icon-sheji"
+            icon="el-icon-edit"
             @click="handleDesign(scope.row, scope.index)"
             >设计
           </el-button>

diff --git a/vue.config.js b/vue.config.js
@@ -10,11 +10,11 @@ module.exports = {
   publicPath: publicPath,
   lintOnSave: true,
   productionSourceMap: false,
+  css: {
+    // 忽略 CSS order 顺序警告
+    extract: { ignoreOrder: true }
+  },
   chainWebpack: config => {
-    // 忽略的打包文件
-    config.externals({
-      'axios': 'axios'
-    })
     const entry = config.entry('app')
     entry
       .add('babel-polyfill')
@@ -33,7 +33,6 @@ module.exports = {
           '^/': '/'
         }
       }
-      // v2.7.0 不需在配置前端代理
     }
   }
 }