Merge branch 'master' into 3.2

# Conflicts:
#	public/cdn/avue/index.js

package.json

@@ -14,6 +14,7 @@
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",
     "clipboard": "^2.0.4",
+    "crypto-js": "^3.1.9-1",
     "echarts": "^4.2.1",
     "element-ui": "^2.4.11",
     "js-cookie": "^2.2.0",

public/index.html

@@ -40,11 +40,6 @@
         </div>
     </div>
     <!-- built files will be auto injected -->
-    <script src="<%= BASE_URL %>util/aes.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>util/aes.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>util/crypto-js.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>util/mode-ecb.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>util/pad-zeropadding.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/vue/2.5.2/vue.min.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/vuex/2.4.1/vuex.min.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/vue-router/3.0.2/vue-router.min.js" charset="utf-8"></script>
@@ -53,4 +48,4 @@
     <script src="<%= BASE_URL %>cdn/avue/index.js" charset="utf-8"></script>
 </body>
 
-</html>
+</html>

public/util/mode-ecb.js

@@ -1,7 +0,0 @@
-/*
-CryptoJS v3.1.2
-code.google.com/p/crypto-js
-(c) 2009-2013 by Jeff Mott. All rights reserved.
-code.google.com/p/crypto-js/wiki/License
-*/
-CryptoJS.mode.ECB = (function () { var a = CryptoJS.lib.BlockCipherMode.extend(); a.Encryptor = a.extend({ processBlock: function (a, b) { this._cipher.encryptBlock(a, b) } }); a.Decryptor = a.extend({ processBlock: function (a, b) { this._cipher.decryptBlock(a, b) } }); return a }())

public/util/pad-zeropadding.js

@@ -1,25 +0,0 @@
-/**
- * Zero padding strategy.
- */
-CryptoJS.pad.ZeroPadding = {
-  pad: function (data, blockSize) {
-    // Shortcut
-    var blockSizeBytes = blockSize * 4
-
-    // Pad
-    data.clamp()
-    data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes)
-  },
-
-  unpad: function (data) {
-    // Shortcut
-    var dataWords = data.words
-
-    // Unpad
-    var i = data.sigBytes - 1
-    while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-      i--
-    }
-    data.sigBytes = i + 1
-  }
-}

src/util/util.js

@@ -1,5 +1,6 @@
 import {validatenull} from './validate'
 import request from '@/router/axios'
+import * as CryptoJS from'crypto-js'
 
 // 表单序列化
 export const serialize = data => {

src/views/gen/index.vue

@@ -132,12 +132,12 @@
       this.getdataSourceList();
     },
     methods: {
-      getList(page, params) {
+      getList(page) {
         this.tableLoading = true
         fetchList(Object.assign({
           current: page.currentPage,
-          size: page.pageSize
-        }, params)).then(response => {
+          size: page.pageSize,
+        }, this.filterForm(this.q))).then(response => {
           this.tableData = response.data.data.records
           this.page.total = response.data.data.total
           this.tableLoading = false
@@ -206,7 +206,7 @@
         this.dsBox = true
       },
       search() {
-        this.getList(this.page, this.filterForm(this.q))
+        this.getList(this.page)
       },
       getdataSourceList() {
         fetchSelectDsList().then(response => {