瀏覽代碼

update deps & prettier

Michael Wang 4 年之前
父節點
當前提交
fa7180343f

+ 18 - 18
package.json

@@ -16,40 +16,40 @@
     "start": "vue-cli-service serve"
   },
   "dependencies": {
-    "axios": "^0.19.0",
+    "axios": "^0.19.2",
     "axios-progress-bar": "^1.2.0",
     "bootstrap": "^4.5.0",
     "core-js": "^3.6.5",
     "element-ui": "^2.13.2",
     "js-cookie": "^2.2.1",
     "lodash-es": "^4.17.15",
-    "moment": "^2.26.0",
+    "moment": "^2.27.0",
     "register-service-worker": "^1.7.1",
     "vue": "^2.6.11",
-    "vue-awesome": "^4.0.2",
+    "vue-awesome": "^4.1.0",
     "vue-navigation": "^1.1.4",
-    "vue-router": "^3.2.0",
-    "vuex": "^3.4.0",
+    "vue-router": "^3.3.4",
+    "vuex": "^3.5.1",
     "vuex-persistedstate": "^3.0.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.3.1",
-    "@vue/cli-plugin-eslint": "^4.3.1",
-    "@vue/cli-plugin-pwa": "^4.3.1",
-    "@vue/cli-plugin-router": "^4.3.1",
-    "@vue/cli-plugin-unit-jest": "^4.3.1",
-    "@vue/cli-plugin-vuex": "^4.3.1",
-    "@vue/cli-service": "^4.3.1",
+    "@vue/cli-plugin-babel": "~4.4.6",
+    "@vue/cli-plugin-eslint": "~4.4.6",
+    "@vue/cli-plugin-pwa": "~4.4.6",
+    "@vue/cli-plugin-router": "~4.4.6",
+    "@vue/cli-plugin-unit-jest": "~4.4.6",
+    "@vue/cli-plugin-vuex": "~4.4.6",
+    "@vue/cli-service": "~4.4.6",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/test-utils": "^1.0.0-beta.31",
     "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint": "^7.5.0",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-vue": "^6.2.2",
-    "lint-staged": "^10.2.4",
-    "prettier": "^1.19.1",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
+    "lint-staged": "^10.2.11",
+    "prettier": "^2.0.5",
+    "sass": "^1.26.10",
+    "sass-loader": "^9.0.2",
     "vue-cli-plugin-axios": "0.0.4",
     "vue-cli-plugin-element": "^1.0.1",
     "vue-template-compiler": "^2.6.11"

+ 2 - 2
postbuild.js

@@ -10,8 +10,8 @@ const fs = require("fs");
 const DIR = "./dist/js/";
 const sourcemaps = fs
   .readdirSync(DIR)
-  .filter(v => v.endsWith(".map"))
-  .map(v => DIR + v);
+  .filter((v) => v.endsWith(".map"))
+  .map((v) => DIR + v);
 for (const s of sourcemaps) {
   fs.renameSync(s, s.replace(".js.map", "-" + revision + ".js.map"));
   console.log(

+ 3 - 3
src/filters/index.js

@@ -1,16 +1,16 @@
 import Vue from "vue";
 
-Vue.filter("booleanYesNoFilter", function(val) {
+Vue.filter("booleanYesNoFilter", function (val) {
   if (val === null) return "无";
   return { true: "是", false: "否" }[val];
 });
 
-Vue.filter("booleanEnableDisableFilter", function(val) {
+Vue.filter("booleanEnableDisableFilter", function (val) {
   if (val === null) return "无";
   return { true: "启用", false: "禁用" }[val];
 });
 
-Vue.filter("booleanPassFilter", function(val) {
+Vue.filter("booleanPassFilter", function (val) {
   if (val === null) return "无";
   return { true: "通过", false: "不通过" }[val];
 });

+ 1 - 1
src/main.js

@@ -43,5 +43,5 @@ if (
 new Vue({
   router,
   store,
-  render: h => h(App),
+  render: (h) => h(App),
 }).$mount("#app");

+ 5 - 5
src/plugins/axiosApp.js

@@ -39,7 +39,7 @@ function gToken(uri, token) {
 }
 
 _axiosApp.interceptors.request.use(
-  function(config) {
+  function (config) {
     const wk_token = getToken();
     if (wk_token) {
       config.headers.common["Authorization"] = gToken(config.url, wk_token);
@@ -49,7 +49,7 @@ _axiosApp.interceptors.request.use(
     }
     return config;
   },
-  function(error) {
+  function (error) {
     // Do something with request error
     Vue.prototype.$notify({
       showClose: true,
@@ -62,10 +62,10 @@ _axiosApp.interceptors.request.use(
 
 // Add a response interceptor
 _axiosApp.interceptors.response.use(
-  response => {
+  (response) => {
     return response;
   },
-  error => {
+  (error) => {
     if (!error.response) {
       // "Network Error" 网络不通,直接返回
 
@@ -123,7 +123,7 @@ _axiosApp.interceptors.response.use(
 _axiosApp.get = cachingGet(_axiosApp.get, cacheGetUrls);
 loadProgressBar(_axiosApp);
 
-Plugin.install = function(Vue) {
+Plugin.install = function (Vue) {
   Object.defineProperties(Vue.prototype, {
     $http: {
       get() {

+ 3 - 3
src/plugins/axiosCache.js

@@ -1,18 +1,18 @@
-export default function(get, regexes) {
+export default function (get, regexes) {
   // cachingGet
   const cache = new Map();
 
   return function cachedGet(url) {
     const key = url;
 
-    if (regexes.some(regex => url.match(regex))) {
+    if (regexes.some((regex) => url.match(regex))) {
       if (cache.has(key)) {
         const request = cache.get(key);
         // console.log("cache.get(key):" + request.then(v => console.log(v)));
         return request;
       } else {
         const request = get(...arguments);
-        return request.then(v => {
+        return request.then((v) => {
           if (v.status === 200) {
             // 如果能取到数据,才缓存
             cache.set(key, request);

+ 5 - 5
src/plugins/axiosNoAuth.js

@@ -17,10 +17,10 @@ const _axiosNoAuth = axios.create(config);
  */
 
 _axiosNoAuth.interceptors.request.use(
-  function(config) {
+  function (config) {
     return config;
   },
-  function(error) {
+  function (error) {
     Vue.prototype.$notify({
       showClose: true,
       message: error,
@@ -32,10 +32,10 @@ _axiosNoAuth.interceptors.request.use(
 
 // Add a response interceptor
 _axiosNoAuth.interceptors.response.use(
-  response => {
+  (response) => {
     return response;
   },
-  error => {
+  (error) => {
     if (!error.response) {
       // "Network Error" 网络不通,直接返回
       Vue.prototype.$notify({
@@ -67,7 +67,7 @@ _axiosNoAuth.interceptors.response.use(
 _axiosNoAuth.get = cachingGet(_axiosNoAuth.get, cacheGetUrls);
 loadProgressBar(_axiosNoAuth);
 
-Plugin.install = function(Vue) {
+Plugin.install = function (Vue) {
   Object.defineProperties(Vue.prototype, {
     $httpNoAuth: {
       get() {

+ 1 - 1
src/plugins/customComponents.js

@@ -5,6 +5,6 @@ const components = {
   //  AppType,
 };
 
-Object.keys(components).forEach(key => {
+Object.keys(components).forEach((key) => {
   Vue.component(key, components[key]);
 });

+ 3 - 3
src/plugins/vueLifecylceLogs.js

@@ -8,7 +8,7 @@ import Vue from "vue";
 
 // const RENDER_DURATION = 1 * 1000;
 
-export default function({
+export default function ({
   ignoreComponents = [undefined, "transition", "router-link", "Bar"],
   ignoreComponentsNameRegexArray = [/^El[A-Z].*/, /^fa-.*/],
   groupCollapsed = true,
@@ -74,7 +74,7 @@ export default function({
   let loggingTime = Date.now();
 
   for (const m of injectMethods) {
-    lifeCycleMixins[m.name] = function() {
+    lifeCycleMixins[m.name] = function () {
       const parentNumber = getParentNumber(this);
       if (!componentNameMatch(this.$options.name)) {
         if (!startLogging) {
@@ -96,7 +96,7 @@ export default function({
   }
 
   for (const m of injectRouterMethods) {
-    lifeCycleMixins[m.name] = function(to, from, next) {
+    lifeCycleMixins[m.name] = function (to, from, next) {
       if (!startLogging) {
         startLogging = true;
         if (groupCollapsed) {

+ 1 - 1
src/router/index.js

@@ -10,7 +10,7 @@ VueRouter.prototype.push = function push(location, onResolve, onReject) {
   if (onResolve || onReject)
     return originalPush.call(this, location, onResolve, onReject);
   try {
-    return originalPush.call(this, location).catch(err => err);
+    return originalPush.call(this, location).catch((err) => err);
   } catch (error) {
     console.log(error);
   }

+ 1 - 1
src/samples/Layout_01/components/NavBar.vue

@@ -31,7 +31,7 @@
               <el-dropdown-item>个人设置</el-dropdown-item>
             </router-link>
             <el-dropdown-item>
-              <span style="display:block;" @click="logout">退出</span>
+              <span style="display: block;" @click="logout">退出</span>
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>

+ 1 - 1
src/samples/Layout_01/components/SideBar.vue

@@ -27,7 +27,7 @@
             <i v-if="item && item.icon" :class="item.icon" />
             <span v-if="item && item.name" slot="title">{{ item.name }}</span>
           </template>
-          <template v-for="child in item.children.filter(v => !v.hidden)">
+          <template v-for="child in item.children.filter((v) => !v.hidden)">
             <router-link :to="item.path + child.path" :key="child.name">
               <el-menu-item :index="item.path + child.path">
                 <span v-if="child && child.name" slot="title">{{

+ 1 - 1
src/samples/Login_01/Login_01.vue

@@ -100,7 +100,7 @@ export default {
   created() {},
   methods: {
     submitBtn() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.$message({
             message: "登录成功",

+ 4 - 4
src/store/modules/user.js

@@ -30,14 +30,14 @@ const user = {
   actions: {
     // 用户名登录
     [LOGIN_BY_USERNAME]({ commit }, userInfo) {
-      return loginByUsername(userInfo).then(response => {
+      return loginByUsername(userInfo).then((response) => {
         const data = response.data;
         commit("SET_USER", omit(data.accessAdminUser, ["token", "uid"]));
         // setKeyToken(response.data.accessAdminUser);
       });
     },
     [LOGIN_BY_PHONE]({ commit }, userInfo) {
-      return loginByPhone(userInfo).then(response => {
+      return loginByPhone(userInfo).then((response) => {
         const data = response.data;
         commit("SET_USER", omit(data.accessAdminUser, ["token", "uid"]));
         // setKeyToken(response.data.accessAdminUser);
@@ -58,7 +58,7 @@ const user = {
             // removeKeyToken();
             resolve();
           })
-          .catch(error => {
+          .catch((error) => {
             reject(error);
           });
       });
@@ -66,7 +66,7 @@ const user = {
 
     // 前端 登出
     FedLogOut({ commit }) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         commit("SET_USER", null);
         // removeKeyToken();
         resolve();

+ 1 - 1
src/utils/queryHandlers.js

@@ -2,6 +2,6 @@ import { omitBy } from "lodash-es";
 
 export default {
   omitEmpty(obj) {
-    return omitBy(obj, v => v === null || v === "" || v === undefined);
+    return omitBy(obj, (v) => v === null || v === "" || v === undefined);
   },
 };

+ 1 - 1
src/utils/utils.js

@@ -6,7 +6,7 @@ export function dateFormatForAPI(date) {
 }
 
 export function formatEmptyToNull(obj) {
-  Object.keys(obj).forEach(key => {
+  Object.keys(obj).forEach((key) => {
     obj[key] = obj[key] === "" || obj[key] === undefined ? null : obj[key];
   });
   return obj;

File diff suppressed because it is too large
+ 579 - 381
yarn.lock


Some files were not shown because too many files changed in this diff