Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

yudao-ui-admin/.env.local

@@ -5,7 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/本地环境
-VUE_APP_BASE_API = '/dev-api'
+# VUE_APP_BASE_API = '/proxy-api'
+VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

yudao-ui-admin/src/api/login.js

@@ -134,3 +134,6 @@ export function authorize(responseType, clientId, redirectUri, state,
     method: 'post'
   })
 }
+
+export class socialBindLogin {
+}

yudao-ui-admin/src/store/modules/user.js

@@ -1,5 +1,5 @@
 import {login, logout, getInfo, socialLogin, socialBindLogin, smsLogin} from '@/api/login'
-import {getAccessToken, setToken, removeToken, getRefreshToken} from '@/utils/auth'
+import {setToken, removeToken} from '@/utils/auth'
 
 const user = {
   state: {

yudao-ui-admin/src/views/bpm/definition/index.vue

@@ -111,7 +111,7 @@ export default {
       showBpmnOpen: false,
       bpmnXML: null,
       bpmnControlForm: {
-        prefix: "activiti"
+        prefix: "flowable"
       },
 
       // 数据字典

yudao-ui-admin/src/views/bpm/model/index.vue

@@ -259,7 +259,7 @@ export default {
       showBpmnOpen: false,
       bpmnXML: null,
       bpmnControlForm: {
-        prefix: "activiti"
+        prefix: "flowable"
       },
 
       // 流程表单详情

yudao-ui-admin/src/views/bpm/processInstance/create.vue

@@ -80,7 +80,7 @@ export default {
       // BPMN 数据
       bpmnXML: null,
       bpmnControlForm: {
-        prefix: "activiti"
+        prefix: "flowable"
       },
 
       // 流程表单

yudao-ui-admin/src/views/bpm/processInstance/detail.vue

@@ -138,7 +138,7 @@ export default {
       // BPMN 数据
       bpmnXML: null,
       bpmnControlForm: {
-        prefix: "activiti"
+        prefix: "flowable"
       },
       activityList: [],
 

yudao-ui-admin/src/views/system/dept/index.vue

@@ -167,7 +167,7 @@ export default {
         ],
         phone: [
           {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            pattern: /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
             message: "请输入正确的手机号码",
             trigger: "blur"
           }

yudao-ui-admin/src/views/system/tenant/index.vue

@@ -183,8 +183,6 @@ export default {
         accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
         expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
         domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
-        username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
-        password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
       }
     };
   },

yudao-ui-admin/src/views/visualization/jmreport/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
+    <i-frame :src="url" />
+  </div>
+</template>
+<script>
+import iFrame from "@/components/iFrame/index";
+import {getAccessToken} from "@/utils/auth";
+export default {
+  name: "JimuReport",
+  components: { iFrame },
+  data() {
+    return {
+      url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),
+    };
+  },
+};
+</script>

yudao-ui-admin/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
+      ['/proxy-api']: {
         target: `http://localhost:48080`,
         // target: `http://api-dashboard.yudao.iocoder.cn`,
         changeOrigin: true,