Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro into feature/1.6.2

Author: YunaiV

.npmrc

@@ -0,0 +1,4 @@
+phantomjs_cdnurl=http://cnpmjs.org/downloads
+chromedriver_cdnurl=http://cdn.npm.taobao.org/dist/chromedriver
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+registry=https://registry.npmmirror.com

package.json

@@ -12,7 +12,8 @@
     "build:dev": "vue-cli-service build --mode dev",
     "build:demo1024": "vue-cli-service build --mode demo1024",
     "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
+    "lint": "eslint --ext .js,.vue src",
+    "clean": "rimraf node_modules"
   },
   "husky": {
     "hooks": {
@@ -62,11 +63,11 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "bpmn-js-token-simulation": "^0.10.0",
-    "min-dash": "^3.5.2",
-    "xml-js": "^1.6.11",
-    "@babel/parser": "^7.7.4",
-    "throttle-debounce": "^2.1.0"
+    "bpmn-js-token-simulation": "0.10.0",
+    "min-dash": "3.5.2",
+    "xml-js": "1.6.11",
+    "@babel/parser": "7.7.4",
+    "throttle-debounce": "2.1.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/components/generator/config.js

@@ -499,7 +499,8 @@ export const selectComponents = [
     __slot__: {
       'list-type': true
     },
-    action: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
+    // action: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
+    action: '/infra/file/upload', // 请求地址
     disabled: false,
     accept: '',
     name: 'file',

src/components/parser/Parser.vue

@@ -1,6 +1,7 @@
 <script>
 import { deepClone } from '@/utils/index'
 import render from '@/components/render/render.js'
+import {getAccessToken} from "@/utils/auth";
 
 const ruleTrigger = {
   'el-input': 'blur',
@@ -79,10 +80,51 @@ function formBtns(h) {
 }
 
 function renderFormItem(h, elementList) {
+  const that = this
+  const data = this[this.formConf.formModel]
+  // const formRef = that.$refs[that.formConf.formRef] // 这里直接添加有问题，此时还找不到表单 $refs
   return elementList.map(scheme => {
     const config = scheme.__config__
     const layout = layouts[config.layout]
 
+    // edit by 芋道源码，解决 el-upload 上传的问题
+    // 参考 https://github.com/JakHuang/form-generator/blob/master/src/components/parser/example/Index.vue 实现
+    const vModel = scheme.__vModel__
+    const val = data[vModel]
+    if (scheme.__config__.tag === 'el-upload') {
+      // 回显图片
+      scheme['file-list'] = (val || []).map(url => ({ name: url, url }))
+      // 上传地址 + 请求头
+      scheme.action = process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload"
+      scheme.headers = { Authorization: "Bearer " + getAccessToken() }
+      // 注意 on-success 不能绑定箭头函数！！！
+      scheme['on-success'] = function (response, file, fileList) {
+        if (response.code !== 0) {
+          return;
+        }
+        // 添加到 data 中
+        const prev = data[vModel] || []
+        this.$set(data, vModel, [
+          ...prev,
+          response.data
+        ])
+        // 发起表单校验
+        that.$refs[that.formConf.formRef].validateField(vModel)
+      }
+      // 注意 on-remove 不能绑定箭头函数！！！
+      scheme['on-remove'] = function (file, fileList) {
+        // 移除从 data 中
+        const prev = data[vModel] || []
+        const index = prev.indexOf(file.response.data)
+        if (index === -1) {
+          return
+        }
+        prev.splice(index, 1) // 直接移除即可，无需重复 set，因为 array 是引用
+        // 发起表单校验
+        that.$refs[that.formConf.formRef].validateField(vModel)
+      }
+    }
+
     if (layout) {
       return layout.call(this, h, scheme)
     }

src/layout/components/TagsView/index.vue

@@ -152,44 +152,37 @@ export default {
       })
     },
     refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
+      this.$tab.refreshPage(view);
     },
     closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+      this.$tab.closePage(view).then(({ visitedViews }) => {
         if (this.isActive(view)) {
           this.toLastView(visitedViews, view)
         }
       })
     },
     closeRightTags() {
-      this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => {
+      this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
         if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
           this.toLastView(visitedViews)
         }
       })
     },
     closeLeftTags() {
-      this.$store.dispatch('tagsView/delLeftTags', this.selectedTag).then(visitedViews => {
+      this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
         if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
           this.toLastView(visitedViews)
         }
       })
     },
     closeOthersTags() {
       this.$router.push(this.selectedTag).catch(()=>{});
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
+      this.$tab.closeOtherPage(this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
+      this.$tab.closeAllPage().then(({ visitedViews }) => {
         if (this.affixTags.some(tag => tag.path === this.$route.path)) {
           return
         }

src/main.js

@@ -69,8 +69,9 @@ import "bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css";
 import Tinymce from '@/components/tinymce/index.vue'
 Vue.component('tinymce', Tinymce)
 import '@/icons'
-import axios from 'axios'
-Vue.prototype.$axios = axios
+import request from "@/utils/request" // 实现 form generator 使用自己定义的 axios request 对象
+console.log(request)
+Vue.prototype.$axios = request
 import '@/styles/index.scss'
 
 /**

src/store/modules/permission.js

@@ -2,6 +2,7 @@ import { constantRoutes } from '@/router'
 import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
+import { toCamelCase } from "@/utils";
 
 const permission = {
   state: {
@@ -56,6 +57,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       icon: route.icon,
       noCache: !route.keepAlive,
     }
+    // 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive
+    route.name = toCamelCase(route.path, true)
     route.hidden = !route.visible
     // 处理 component 属性
     if (route.children) { // 父节点

src/store/modules/tagsView.js

@@ -63,7 +63,7 @@ const mutations = {
       }
     }
   },
-
+  
   DEL_RIGHT_VIEWS: (state, view) => {
     const index = state.visitedViews.findIndex(v => v.path === view.path)
     if (index === -1) {
@@ -79,6 +79,23 @@ const mutations = {
       }
       return false
     })
+  },
+
+  DEL_LEFT_VIEWS: (state, view) => {
+    const index = state.visitedViews.findIndex(v => v.path === view.path)
+    if (index === -1) {
+      return
+    }
+    state.visitedViews = state.visitedViews.filter((item, idx) => {
+      if (idx >= index || (item.meta && item.meta.affix)) {
+        return true
+      }
+      const i = state.cachedViews.indexOf(item.name)
+      if (i > -1) {
+        state.cachedViews.splice(i, 1)
+      }
+      return false
+    })
   }
 }
 
@@ -172,7 +189,14 @@ const actions = {
       commit('DEL_RIGHT_VIEWS', view)
       resolve([...state.visitedViews])
     })
-  }
+  },
+
+  delLeftTags({ commit }, view) {
+    return new Promise(resolve => {
+      commit('DEL_LEFT_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  },
 }
 
 export default {

src/utils/auth.js

@@ -1,22 +1,96 @@
-import Cookies from 'js-cookie'
+import {decrypt, encrypt} from "@/utils/jsencrypt";
 
 const AccessTokenKey = 'ACCESS_TOKEN'
 const RefreshTokenKey = 'REFRESH_TOKEN'
 
+// ========== Token 相关 ==========
+
 export function getAccessToken() {
-  return Cookies.get(AccessTokenKey)
+  return localStorage.getItem(AccessTokenKey)
 }
 
 export function getRefreshToken() {
-  return Cookies.get(RefreshTokenKey)
+  return localStorage.getItem(RefreshTokenKey)
 }
 
 export function setToken(token) {
-  Cookies.set(AccessTokenKey, token.accessToken)
-  Cookies.set(RefreshTokenKey, token.refreshToken)
+  localStorage.setItem(AccessTokenKey, token.accessToken)
+  localStorage.setItem(RefreshTokenKey, token.refreshToken)
 }
 
 export function removeToken() {
-  Cookies.remove(AccessTokenKey)
-  Cookies.remove(RefreshTokenKey)
+  localStorage.removeItem(AccessTokenKey)
+  localStorage.removeItem(RefreshTokenKey)
+}
+
+// ========== 账号相关 ==========
+
+const UsernameKey = 'USERNAME'
+const PasswordKey = 'PASSWORD'
+const RememberMeKey = 'REMEMBER_ME'
+
+export function getUsername() {
+  return localStorage.getItem(UsernameKey)
+}
+
+export function setUsername(username) {
+  localStorage.setItem(UsernameKey, username)
+}
+
+export function removeUsername() {
+  localStorage.removeItem(UsernameKey)
+}
+
+export function getPassword() {
+  const password = localStorage.getItem(PasswordKey)
+  return password ? decrypt(password) : undefined
+}
+
+export function setPassword(password) {
+  localStorage.setItem(PasswordKey, encrypt(password))
+}
+
+export function removePassword() {
+  localStorage.removeItem(PasswordKey)
+}
+
+export function getRememberMe() {
+  return localStorage.getItem(RememberMeKey) === 'true'
+}
+
+export function setRememberMe(rememberMe) {
+  localStorage.setItem(RememberMeKey, rememberMe)
+}
+
+export function removeRememberMe() {
+  localStorage.removeItem(RememberMeKey)
+}
+
+// ========== 租户相关 ==========
+
+const TenantIdKey = 'TENANT_ID'
+const TenantNameKey = 'TENANT_NAME'
+
+export function getTenantName() {
+  return localStorage.getItem(TenantNameKey)
+}
+
+export function setTenantName(username) {
+  localStorage.setItem(TenantNameKey, username)
+}
+
+export function removeTenantName() {
+  localStorage.removeItem(TenantNameKey)
+}
+
+export function getTenantId() {
+  return localStorage.getItem(TenantIdKey)
+}
+
+export function setTenantId(username) {
+  localStorage.setItem(TenantIdKey, username)
+}
+
+export function removeTenantId() {
+  localStorage.removeItem(TenantIdKey)
 }

src/utils/constants.js

@@ -75,13 +75,13 @@ export const SystemUserSocialTypeEnum = {
     title: "钉钉",
     type: 20,
     source: "dingtalk",
-    img: "https://cdn.jsdelivr.net/gh/justauth/[email protected]/dingtalk.png",
+    img: "https://s1.ax1x.com/2022/05/22/OzMDRs.png",
   },
   WECHAT_ENTERPRISE: {
     title: "企业微信",
     type: 30,
     source: "wechat_enterprise",
-    img: "https://cdn.jsdelivr.net/gh/justauth/[email protected]/wechat_enterprise.png",
+    img: "https://s1.ax1x.com/2022/05/22/OzMrzn.png",
   }
 }