Merge remote-tracking branch 'origin/master' into feature/bpm-back

Author: cuicui20210817

.env.demo1024

@@ -13,3 +13,12 @@ VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 PUBLIC_PATH = '/admin-ui/'
 # 二级部署路径
 VUE_APP_APP_NAME ='/admin-ui/'
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

.env.development

@@ -13,3 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

.env.production

@@ -12,3 +12,11 @@ PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = false
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

.env.staging

@@ -11,3 +11,12 @@ VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
 # 静态资源地址
 PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = false
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.0-snapshot",
+  "version": "1.6.1-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",

src/api/infra/fileConfig.js

@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+// 创建文件配置
+export function createFileConfig(data) {
+  return request({
+    url: '/infra/file-config/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新文件配置
+export function updateFileConfig(data) {
+  return request({
+    url: '/infra/file-config/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 更新文件配置为主配置
+export function updateFileConfigMaster(id) {
+  return request({
+    url: '/infra/file-config/update-master?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除文件配置
+export function deleteFileConfig(id) {
+  return request({
+    url: '/infra/file-config/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得文件配置
+export function getFileConfig(id) {
+  return request({
+    url: '/infra/file-config/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得文件配置分页
+export function getFileConfigPage(query) {
+  return request({
+    url: '/infra/file-config/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function testFileConfig(id) {
+  return request({
+    url: '/infra/file-config/test?id=' + id,
+    method: 'get'
+  })
+}

src/assets/styles/sidebar.scss

@@ -7,6 +7,10 @@
     position: relative;
   }
 
+  .sidebarHide {
+    margin-left: 0!important;
+  }
+
   .sidebar-container {
     -webkit-transition: width .28s;
     transition: width 0.28s;

src/components/Breadcrumb/index.vue

@@ -45,7 +45,8 @@ export default {
       if (!name) {
         return false
       }
-      return name.trim() === 'Index'
+      // return name.trim() === 'Index'
+      return name.trim() === '首页' // 修复 Index 重复的问题
     },
     handleLink(item) {
       const { redirect, path } = item

src/components/DictTag/index.vue

@@ -17,7 +17,7 @@ export default {
   name: "DictTag",
   props: {
     type: String,
-    value: [Number, String, Array],
+    value: [Number, String, Boolean, Array],
   },
 };
 </script>

src/components/DocAlert/index.vue

@@ -0,0 +1,25 @@
+<template>
+  <el-alert v-if="enable()" :title="'【' + title + '】文档地址：' + url" type="success" show-icon />
+</template>
+
+<script>
+import {getDocEnable} from "@/utils/ruoyi";
+
+export default {
+  name: "DocAlert",
+  props: {
+    title: String,
+    url: String,
+  },
+  methods: {
+    enable: function () {
+      return getDocEnable();
+    }
+  }
+};
+</script>
+<style scoped>
+.el-alert--success.is-light {
+  margin-bottom: 10px;
+}
+</style>