diff --git a/yudao-ui-admin/.env.demo1024 b/yudao-ui-admin/.env.demo1024
index d2897f1ea..21f48d031 100644
--- a/yudao-ui-admin/.env.demo1024
+++ b/yudao-ui-admin/.env.demo1024
@@ -13,3 +13,9 @@ 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
diff --git a/yudao-ui-admin/.env.development b/yudao-ui-admin/.env.development
index 7f6246a9e..e7841a631 100644
--- a/yudao-ui-admin/.env.development
+++ b/yudao-ui-admin/.env.development
@@ -13,3 +13,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
diff --git a/yudao-ui-admin/.env.production b/yudao-ui-admin/.env.production
index 535990c4a..377f92f1b 100644
--- a/yudao-ui-admin/.env.production
+++ b/yudao-ui-admin/.env.production
@@ -12,3 +12,8 @@ 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
diff --git a/yudao-ui-admin/.env.staging b/yudao-ui-admin/.env.staging
index 7cb5fb84d..cb7b007b1 100644
--- a/yudao-ui-admin/.env.staging
+++ b/yudao-ui-admin/.env.staging
@@ -11,3 +11,9 @@ 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
diff --git a/yudao-ui-admin/src/components/DocAlert/index.vue b/yudao-ui-admin/src/components/DocAlert/index.vue
new file mode 100644
index 000000000..541b8ed20
--- /dev/null
+++ b/yudao-ui-admin/src/components/DocAlert/index.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js
index a572d937c..8252a97b2 100644
--- a/yudao-ui-admin/src/main.js
+++ b/yudao-ui-admin/src/main.js
@@ -41,10 +41,12 @@ Vue.prototype.handleTree = handleTree
// 全局组件挂载
Vue.component('DictTag', DictTag)
+Vue.component('DocAlert', DocAlert)
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
// 字典标签组件
import DictTag from '@/components/DictTag'
+import DocAlert from '@/components/DocAlert'
// 头部标签插件
import VueMeta from 'vue-meta'
diff --git a/yudao-ui-admin/src/utils/ruoyi.js b/yudao-ui-admin/src/utils/ruoyi.js
index 3dd996cee..dd7dcd19f 100644
--- a/yudao-ui-admin/src/utils/ruoyi.js
+++ b/yudao-ui-admin/src/utils/ruoyi.js
@@ -175,7 +175,7 @@ export function getNowDateTime(timeStr) {
* 获得租户功能是否开启
*/
export function getTenantEnable() {
- console.log("enable: " + process.env.VUE_APP_TENANT_ENABLE)
+ // console.log("enable: " + process.env.VUE_APP_TENANT_ENABLE)
if (process.env.VUE_APP_TENANT_ENABLE === "true") {
return true;
}
@@ -184,3 +184,16 @@ export function getTenantEnable() {
}
return process.env.VUE_APP_TENANT_ENABLE || true;
}
+
+/**
+ * 获得文档是否开启
+ */
+export function getDocEnable() {
+ if (process.env.VUE_APP_DOC_ENABLE === "true") {
+ return true;
+ }
+ if (process.env.VUE_APP_DOC_ENABLE === "false") {
+ return false;
+ }
+ return process.env.VUE_APP_DOC_ENABLE || false;
+}
diff --git a/yudao-ui-admin/src/views/bpm/definition/index.vue b/yudao-ui-admin/src/views/bpm/definition/index.vue
index 277047ee4..43f194234 100644
--- a/yudao-ui-admin/src/views/bpm/definition/index.vue
+++ b/yudao-ui-admin/src/views/bpm/definition/index.vue
@@ -1,5 +1,7 @@
+
+
diff --git a/yudao-ui-admin/src/views/bpm/form/index.vue b/yudao-ui-admin/src/views/bpm/form/index.vue
index eef300908..e4cb90568 100644
--- a/yudao-ui-admin/src/views/bpm/form/index.vue
+++ b/yudao-ui-admin/src/views/bpm/form/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue
index cf41aa8bd..b13241cf8 100644
--- a/yudao-ui-admin/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin/src/views/bpm/group/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue
index 029ad9f60..35ae26f35 100644
--- a/yudao-ui-admin/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin/src/views/bpm/model/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
index 9dc99762e..83b3f786e 100644
--- a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
+++ b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
index 3cb4e2cbc..fa1250760 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/task/done.vue b/yudao-ui-admin/src/views/bpm/task/done.vue
index 926260b2f..a2eb8c24d 100644
--- a/yudao-ui-admin/src/views/bpm/task/done.vue
+++ b/yudao-ui-admin/src/views/bpm/task/done.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/bpm/task/todo.vue b/yudao-ui-admin/src/views/bpm/task/todo.vue
index f5d82b35b..db3324dd8 100644
--- a/yudao-ui-admin/src/views/bpm/task/todo.vue
+++ b/yudao-ui-admin/src/views/bpm/task/todo.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/infra/codegen/index.vue b/yudao-ui-admin/src/views/infra/codegen/index.vue
index 292f3bc84..7ecc88349 100644
--- a/yudao-ui-admin/src/views/infra/codegen/index.vue
+++ b/yudao-ui-admin/src/views/infra/codegen/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/infra/file/index.vue b/yudao-ui-admin/src/views/infra/file/index.vue
index 5786af171..0ce63df69 100644
--- a/yudao-ui-admin/src/views/infra/file/index.vue
+++ b/yudao-ui-admin/src/views/infra/file/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/yudao-ui-admin/src/views/infra/fileConfig/index.vue b/yudao-ui-admin/src/views/infra/fileConfig/index.vue
index 1257c5e30..92af468dc 100755
--- a/yudao-ui-admin/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin/src/views/infra/fileConfig/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/yudao-ui-admin/src/views/system/menu/index.vue b/yudao-ui-admin/src/views/system/menu/index.vue
index db5a9184d..460a5df18 100644
--- a/yudao-ui-admin/src/views/system/menu/index.vue
+++ b/yudao-ui-admin/src/views/system/menu/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/system/role/index.vue b/yudao-ui-admin/src/views/system/role/index.vue
index 57adc1d01..a56349d3b 100644
--- a/yudao-ui-admin/src/views/system/role/index.vue
+++ b/yudao-ui-admin/src/views/system/role/index.vue
@@ -1,5 +1,7 @@
+
+
-
+
diff --git a/yudao-ui-admin/src/views/system/tenantPackage/index.vue b/yudao-ui-admin/src/views/system/tenantPackage/index.vue
index f697d461b..eecc52e1c 100755
--- a/yudao-ui-admin/src/views/system/tenantPackage/index.vue
+++ b/yudao-ui-admin/src/views/system/tenantPackage/index.vue
@@ -1,6 +1,6 @@
-
+