fix:修复空组织判断,AI接口不鉴权和本地启动不登录等问题

Author: lichunn

designer-demo/engine.config.js

@@ -1,3 +1,5 @@
+const isDevelopEnv = import.meta.env.MODE?.includes('dev')
+
 export default {
   id: 'engine.config',
   theme: 'light',
@@ -7,5 +9,5 @@ export default {
   // 是否开启 TailWindCSS 特性
   enableTailwindCSS: true,
   // 是否启用登录
-  enableLogin: true
+  enableLogin: isDevelopEnv ? false : true
 }

packages/common/composable/http/index.ts

@@ -104,6 +104,8 @@ const whiteList = [
   '/platform-center/api/user/me',
   '/platform-center/api/user/tenant'
 ]
+// 不鉴权名单
+const notAuthList = ['app-center/api/chat/completions', 'app-center/api/ai/chat', 'app-center/api/ai/search']
 const LoginErrorCode = ['CM004', 'CM005', 'CM006', 'CM007', 'CM336', 'CM339']
 
 // 创建 AbortController 并关联到请求
@@ -189,7 +191,9 @@ const requestHandler = (config) => {
       return new Promise(() => {})
     }
   } else {
-    config.headers.Authorization = `Bearer ${token}`
+    if (!notAuthList.some((url) => config.url.includes(url))) {
+      config.headers.Authorization = `Bearer ${token}`
+    }
   }
 
   // 请求结束时清理 AbortController

packages/design-core/registry.js

@@ -57,6 +57,7 @@ import {
   TemplateCenter
 } from './re-export'
 
+const isDevelopEnv = import.meta.env.MODE?.includes('dev')
 window.__TINY_ENGINE_REMOVED_REGISTRY = {}
 
 export default {
@@ -135,7 +136,7 @@ export default {
       }
     ],
     enableTailwindCSS: true,
-    enableLogin: true
+    enableLogin: isDevelopEnv ? false : true
   },
   layout: __TINY_ENGINE_REMOVED_REGISTRY['engine.layout'] === false ? null : Layout,
   toolbars: [

packages/toolbars/user/src/Main.vue

@@ -19,6 +19,7 @@
               <svg-icon class="plus-circle" name="plus-circle" @click="createTenant"></svg-icon>
             </div>
           </div>
+          <div class="tenant-tip" v-if="state.isShowTenantTip">组织名不能为空</div>
           <div class="user-tenant">
             <div class="tenant-label">选择组织</div>
             <div class="tenant-item">
@@ -38,14 +39,15 @@
 <script lang="ts">
 import { reactive, computed } from 'vue'
 import type { Component } from 'vue'
-import { Popover, Select, Input } from '@opentiny/vue'
+import { Popover, Select, Input, Tooltip } from '@opentiny/vue'
 import { getMetaApi, META_SERVICE, useModal } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
     TinyPopover: Popover as Component,
     TinySelect: Select,
-    TinyInput: Input
+    TinyInput: Input,
+    TinyTooltip: Tooltip
   },
   props: {
     iconExpand: {
@@ -63,20 +65,23 @@ export default {
     )
     const state = reactive({
       tenantValue: getBaseInfo().tenantId,
-      newTenant: ''
+      newTenant: '',
+      isShowTenantTip: false
     })
 
     const userInfo = computed(() => getUserInfo())
     const tenantList = computed(() => {
       const info = getUserInfo()
 
-      return info.tenant?.map((item) => {
-        return {
-          ...item,
-          value: item.id,
-          label: item.nameEn
-        }
-      })
+      return Array.isArray(info?.tenant)
+        ? info.tenant?.map((item) => {
+            return {
+              ...item,
+              value: item.id,
+              label: item.nameEn
+            }
+          })
+        : []
     })
 
     const logOut = () => {
@@ -85,6 +90,15 @@ export default {
     }
 
     const createTenant = () => {
+      if (!state.newTenant.length) {
+        state.isShowTenantTip = true
+        setTimeout(() => {
+          state.isShowTenantTip = false
+        }, 2000)
+
+        return
+      }
+
       getMetaApi(META_SERVICE.Http)
         .post('/platform-center/api/tenant/create', {
           nameEn: state.newTenant
@@ -158,6 +172,10 @@ export default {
       cursor: pointer;
     }
   }
+  .tenant-tip {
+    color: var(--te-toolbars-user-text-color-error);
+    padding-left: 60px;
+  }
   .tenant-label {
     font-size: 12px;
     margin-right: 6px;

packages/toolbars/user/src/styles/vars.less

@@ -1,4 +1,4 @@
 :root {
-    --te-toolbars-user-border-bottom-color: var(--te-common-border-default);
-  }
-  
+  --te-toolbars-user-border-bottom-color: var(--te-common-border-default);
+  --te-toolbars-user-text-color-error: var(--te-common-color-error);
+}