merge pig-ui 3.2.0

docker/pig-ui.conf

@@ -11,6 +11,7 @@ server {
        proxy_connect_timeout 15s;
        proxy_send_timeout 15s;
        proxy_read_timeout 15s;
+       proxy_set_header X-Forwarded-Proto http;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pig-ui",
-  "version": "2.10.0",
+  "version": "3.2.0",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
@@ -17,28 +17,25 @@
   "main": "background.js",
   "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.12",
     "avue-plugin-ueditor": "^0.0.6",
-    "axios": "^0.19.0",
+    "axios": "0.19.0",
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",
     "codemirror": "^5.58.1",
     "crypto-js": "^3.1.9-1",
     "element-ui": "^2.13.2",
-    "js-cookie": "^2.2.1",
-    "minimist": "^1.2.5",
     "nprogress": "^0.2.0",
     "script-loader": "^0.7.2",
     "vue": "^2.6.10",
     "vue-axios": "^2.1.4",
     "vue-router": "^3.1.3",
-    "vuex": "^3.1.1"
+    "vuex": "^3.2.0"
   },
   "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",
     "electron": "^9.0.0",
     "electron-devtools-installer": "^3.1.0",

public/index.html

@@ -42,8 +42,6 @@
             </div>
         </div>
     </div>
-    <!-- built files will be auto injected -->
-    <script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
 </body>
 
 </html>

src/const/crud/gen/gen.js

@@ -15,6 +15,21 @@
  * Author: test
  */
 
+/**
+ * 
+ * @param {校验数据源名} rule 
+ * @param {*} value 
+ * @param {*} callback 
+ */
+var validateDsName = (rule, value, callback) => {
+  var re = /(?=.*[a-z])(?=.*_)/;
+  if (value && (!(re).test(value))) {
+    callback(new Error('数据源名称不合法, 组名_数据源名形式'))
+  } else {
+    callback()
+  }
+}
+
 export const tableOption = {
   selection: true,
   border: true,
@@ -53,8 +68,8 @@ export const tableOption = {
 }
 
 export const formOption = {
-  submitBtn:false,
-  emptyBtn:false,
+  submitBtn: false,
+  emptyBtn: false,
   submitText: '生成',
   column: [
     {
@@ -136,7 +151,8 @@ export const tableDsOption = {
       prop: 'name',
       rules: [
         { required: true, message: '请输入名称', trigger: 'blur' },
-        { max: 32, message: '长度在 32 个字符', trigger: 'blur' }
+        { max: 32, message: '长度在 32 个字符', trigger: 'blur' },
+        { validator: validateDsName, trigger: 'blur' }
       ]
     },
     {

src/main.js

@@ -23,6 +23,7 @@ import * as filters from './filters' // 全局filter
 import './styles/common.scss'
 import basicContainer from './components/basic-container/main'
 
+window.axios = axios
 Vue.use(VueAxios, axios)
 
 Vue.use(ElementUI, {

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>©2021 v3.2.0</p>
       </div>
       <div class="login-border">
         <div class="login-main">

src/page/wel.vue

@@ -4,30 +4,30 @@
       <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%20Cloud-Hoxton.SR8-blue.svg" alt="Coverage Status">
+          <img src="https://img.shields.io/badge/Spring%20Boot-2.4.5-yellowgreen.svg" alt="Downloads">
+          <img src="https://img.shields.io/badge/Spring%20Cloud-2020-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 Cloud 2020</div>
+              <div>基于Spring Boot 2.4.5</div>
             </el-collapse-item>
             <el-collapse-item name="2">
               <div>支持docker部署</div>
               <div>支持Rancher2 + Kubernetes部署</div>
             </el-collapse-item>
             <el-collapse-item name="3">
-              <div>基于开源LCN 分布式事务解决方案深度定制</div>
+              <div>基于Spring Security OAuth 2.0 深度定制</div>
               <div>完美兼容2.X，优化集群部署，提升性能</div>
             </el-collapse-item>
             <el-collapse-item name="4">
-              <div>SAAS多租户</div>
-              <div>Activiti工作流</div>
-              <div><a href="https://pig4cloud.com" target="_blank">详细介绍pigx </a></div>
+              <div>深度定制 Spring Cloud Alibaba 便于开发使用</div>
+              <div>完善监控流程，支持微服务全组件接入监控</div>
+              <div><a href="https://pig4cloud.com" target="_blank">详细介绍</a></div>
             </el-collapse-item>
           </el-collapse>
         </span>

src/router/axios.js

@@ -1,5 +1,5 @@
+import axios from 'axios'
 import {serialize} from '@/util/util'
-import {getStore} from '../util/store'
 import NProgress from 'nprogress' // progress bar
 import errorCode from '@/const/errorCode'
 import router from "@/router/router"

src/views/admin/client/index.vue

@@ -19,7 +19,7 @@
   <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
-                 :page="page"
+                 :page.sync="page"
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"