feat: 支持环境变量开启新建租户功能

src/bk-login/pages/src/views/home.vue

@@ -225,7 +225,7 @@ const handleTenantChange = async (id: string) => {
     inputTenant.value = null;
     return;
   }
-  let selected = allTenantList.value.find(item => item.id === id);
+  let selected = allTenantList.value.find(item => item.id === id) || inputTenant.value?.find(item => item.id === id);
   if (!selected) {
     const res = await getTenantList({
       tenant_ids: id,
@@ -441,9 +441,7 @@ const getUserGroupName = (tenant: Tenant) => {
   if (userGroupId === tenant.id) {
     return '本租户';
   }
-  const list = tenant.collaboration_tenants || [];
-  const current = list.find(item => item.id === userGroup.value);
-  return current?.name || '';
+  return userGroupId
 };
 
 /**

src/pages/.bk.development.env

@@ -24,4 +24,6 @@ BK_ENABLE_BK_NOTICE = ''
 
 BK_SHARED_RES_URL = ''
 
-BK_ENABLE_VIRTUAL_USER = ''
+BK_ENABLE_VIRTUAL_USER = ''
+
+BK_ENABLE_CREATE_TENANT = ''

src/pages/.bk.production.env

@@ -23,3 +23,5 @@ BK_ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}'
 BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}'
 
 BK_ENABLE_VIRTUAL_USER = '{{ ENABLE_VIRTUAL_USER }}'
+
+BK_ENABLE_CREATE_TENANT = '{{ ENABLE_CREATE_TENANT }}' 

src/pages/src/http/fetch/index.ts

@@ -86,7 +86,7 @@ const handleResponse = <T>({
 
 const handleReject = (error: AxiosError, config: Record<string, any>) => {
   const { status } = error.response;
-  const { message, data, code, details } = error.response.data.error;
+  const { message = '', data = {}, code = '', details = [] } = error.response.data.error;
 
   if (status === 401) {
     if (error.config.url === '/api/v1/web/basic/current-user/') {

src/pages/src/language/en.json

@@ -536,5 +536,7 @@
   "回调地址为：": "The callback address is: ",
   "确认要关闭企业微信登录吗？": "Are you sure you want to disable WeChat Work login?",
   "关闭后用户将无法通过企业微信登录": "After deactivation, users will not be able to log in via WeChat Work",
-  "请将以下回调地址填写到企业微信配置内：": "Please enter the following callback address in the enterprise wechat configuration:"
+  "请将以下回调地址填写到企业微信配置内：": "Please enter the following callback address in the enterprise wechat configuration:",
+  "至": "to ",
+  "成功 ": " Success"
 }

src/pages/src/language/zh.json

@@ -536,5 +536,7 @@
   "回调地址为：": "回调地址为：",
   "确认要关闭企业微信登录吗？": "确认要关闭企业微信登录吗？",
   "关闭后用户将无法通过企业微信登录": "关闭后用户将无法通过企业微信登录",
-  "请将以下回调地址填写到企业微信配置内：": "请将以下回调地址填写到企业微信配置内："
+  "请将以下回调地址填写到企业微信配置内：": "请将以下回调地址填写到企业微信配置内：",
+  "至": "至",
+  "成功 ": "成功"
 }

src/pages/src/views/organization/details/ViewUser.vue

@@ -127,7 +127,7 @@ const dateOptions = computed(() => {
   ];
   const options = expirationTimes.map(({ num, unit, label }) => {
     const date = defineDateTime(num, unit);
-    return { id: `${date} 00:00:00`, name: `${label} (至${date})` };
+    return { id: `${date} 00:00:00`, name: `${label} (${t('至')}${date})` };
   });
   options.push(
     { id: '2100-1-1T00:00:00', name: t('永久') },

src/pages/src/views/setting/data-source/NewDataSource.vue

@@ -117,7 +117,7 @@ const handleCollapse = () => {
 const successText = ref('新建企业微信数据源成功');
 const isSuccess = ref(false);
 const updateSuccess = (value: string) => {
-  successText.value = `${value}${currentPlugins.value[0].name}成功`;
+  successText.value = `${value}${currentPlugins.value[0].name}${t('成功 ')}`;
   isSuccess.value = true;
 };
 

src/pages/src/views/tenant/index.vue

@@ -5,7 +5,7 @@
     <div class="main-content">
       <div class="content-search">
         <div class="content-search-left">
-          <bk-button class="mr-[24px]" theme="primary" @click="handleClick('add')">
+          <bk-button v-if="isCreateTenant" class="mr-[24px]" theme="primary" @click="handleClick('add')">
             <i class="user-icon icon-add-2 mr8" />
             {{ $t('新建租户') }}
           </bk-button>
@@ -203,27 +203,27 @@
           <div class="mb-[18px]">
             <bk-checkbox v-model="smsValue" @change="changeSms">{{ $t('短信') }}</bk-checkbox>
             <PhoneInput
-            :form-data="adminPasswordData"
-            :tel-error="telError"
-            :required="smsValue"
-            @change-country-code="changeCountryCode"
-            @change-tel-error="changeTelError" />
+              :form-data="adminPasswordData"
+              :tel-error="telError"
+              :required="smsValue"
+              @change-country-code="changeCountryCode"
+              @change-tel-error="changeTelError" />
           </div>
           <div>
             <bk-checkbox v-model="emailValue" @change="changeEmail">{{ $t('邮箱') }}</bk-checkbox>
             <div>
-            <bk-input
-              :class="{ 'input-error': emailError }"
-              v-model="adminPasswordData.email"
-              @blur="emailBlur"
-              @input="handleInput" />
-            <p class="error" v-show="emailError">{{ $t('请输入正确的邮箱地址') }}</p>
-          </div>
+              <bk-input
+                :class="{ 'input-error': emailError }"
+                v-model="adminPasswordData.email"
+                @blur="emailBlur"
+                @input="handleInput" />
+              <p class="error" v-show="emailError">{{ $t('请输入正确的邮箱地址') }}</p>
+            </div>
           </div>
         </bk-form-item>
       </bk-form>
     </bk-dialog>
-        <!-- 创建租户成功弹窗 -->
+    <!-- 创建租户成功弹窗 -->
     <bk-dialog
       class="tenant-success"
       v-model:is-show="isShowDialog"
@@ -288,6 +288,7 @@ import OperationDetails from './OperationDetails.vue';
 import ViewDetails from './ViewDetails.vue';
 
 import Empty from '@/components/Empty.vue';
+import LabelContent from '@/components/layouts/LabelContent.vue';
 import passwordInput from '@/components/passwordInput.vue';
 import PhoneInput from '@/components/phoneInput.vue';
 import { useAdminPassword, useInfoBoxContent, useTableMaxHeight, useValidate } from '@/hooks';
@@ -303,16 +304,16 @@ import {
 } from '@/http';
 import { t } from '@/language/index';
 import router from '@/router';
-import { useMainViewStore, useUser, platformConfig} from '@/store';
-import { LOGO_COLOR, logoConvert, tenantStatus, copy} from '@/utils';
-import LabelContent from '@/components/layouts/LabelContent.vue';
+import { platformConfig, useMainViewStore, useUser } from '@/store';
+import { copy, LOGO_COLOR, logoConvert, tenantStatus } from '@/utils';
 
 const userStore = useUser();
 const store = useMainViewStore();
-const  platformConfigData = platformConfig()
+const  platformConfigData = platformConfig();
 const contact = computed(() => platformConfigData.i18n.footerInfoHTML);
 const copyright = computed(() => platformConfigData.footerCopyrightContent);
 store.customBreadcrumbs = false;
+const isCreateTenant = window.ENABLE_CREATE_TENANT !== 'False';
 
 const validate = useValidate();
 const tableMaxHeight = useTableMaxHeight(202);
@@ -507,21 +508,21 @@ const updateTenantsList = (type: string, formData: any) => {
   isCreated.value = type === 'add';
   newId.value = formData?.id;
   fetchTenantsList();
-  if(isCreated.value) {
+  if (isCreated.value) {
     Object.assign(dialogData.value, {
-    ...formData,
-    isShowItem: formData.notification_methods?.length === 0,
-    emailNotification: formData.notification_methods?.includes('email') ? t('邮箱') : '',
-    smsNotification: formData.notification_methods?.includes('sms') ? t('短信') : '',
-    accessUrl: location.origin
-  })
-    isShowDialog.value = true
+      ...formData,
+      isShowItem: formData.notification_methods?.length === 0,
+      emailNotification: formData.notification_methods?.includes('email') ? t('邮箱') : '',
+      smsNotification: formData.notification_methods?.includes('sms') ? t('短信') : '',
+      accessUrl: location.origin,
+    });
+    isShowDialog.value = true;
   } else {
     Message({
-    theme: 'success',
-    message: t('租户更新成功'),
-  });
-}
+      theme: 'success',
+      message: t('租户更新成功'),
+    });
+  }
 };
 
 const dialogRef = ref();
@@ -535,7 +536,7 @@ const getDialogContentText = () => {
 const copyContent = () => {
   const container = getDialogContentText();
   copy(container);
-  isShowDialog.value = false
+  isShowDialog.value = false;
 };
 
 const handleBeforeClose = async () => {

src/pages/types/global.d.ts

@@ -12,4 +12,5 @@ declare interface Window {
   ENABLE_BK_NOTICE: string
   BK_SHARED_RES_URL: string
   ENABLE_VIRTUAL_USER: string
+  ENABLE_CREATE_TENANT:string
 }