merge branch 'tiny/develop'

Author: SonyLeo

.github/workflows/deploy-gh-pages.yml

@@ -3,6 +3,16 @@ name: Deploy to GitHub Pages
 on:
   push:
     branches: [develop]
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Backend environment'
+        required: true
+        default: 'alpha'
+        type: choice
+        options:
+          - alpha
+          - production
 
 jobs:
   deploy-gh-pages:
@@ -31,14 +41,17 @@ jobs:
 
       - name: add environment variable
         run: |
-          cat <<'EOF' >> designer-demo/env/.env.alpha
-          // ---- appended by CI (gh-pages) ----
-          VITE_ORIGIN=https://agent.opentiny.design/
+          ENV=${{ github.event.inputs.environment || 'alpha' }}
+          VITE_ORIGIN_URL="https://agent-alpha.opentiny.design/"
+          if [ "$ENV" = "production" ]; then
+            VITE_ORIGIN_URL="https://agent.opentiny.design/"
+          fi
+          cat <<EOF >> designer-demo/env/.env.alpha
+          # ---- appended by CI (gh-pages) ----
+          VITE_ORIGIN=$VITE_ORIGIN_URL
           EOF
-      - name: change material url
-        run: |
-          sed -i "s#material: \['/mock/bundle.json'\]#material: \['https://opentiny.github.io/tiny-engine/mock/bundle.json'\]#g" designer-demo/engine.config.js
-          echo "Updated material url in designer-demo/engine.config.js"
+          echo "DEPLOY_ENV=$ENV"
+          echo "VITE_ORIGIN_URL=$VITE_ORIGIN_URL"
       - name: Run Build
         run: |
           set -eo pipefail

designer-demo/engine.config.js

@@ -1,7 +1,7 @@
 export default {
   id: 'engine.config',
   theme: 'light',
-  material: ['/mock/bundle.json'],
+  material: ['./mock/bundle.json'],
   scripts: [],
   styles: [],
   // 是否开启 TailWindCSS 特性

packages/common/composable/defaultGlobalService.ts

@@ -49,32 +49,30 @@ const userState = reactive({
     username: '',
     token: null,
     expireTime: null,
-    tenantId: ''
+    tenantId: '',
+    tenant: []
   },
   needToLogin: false
 })
 
 const getLoginStatus = () => userState.needToLogin
 
-const setNeedToLogin = (value: boolean, tenantId: any) => {
+const setNeedToLogin = (value: boolean) => {
   userState.needToLogin = value
   if (!value) {
-    const baseUrl = `${window.location.origin}${window.location.pathname}?type=app&`
-    const id = getBaseInfo().id
-    const baseTenantId = getBaseInfo().tenantId
-
-    // 浏览器Url没有组织id，都默认公共组织，应用id默认为公共组织的应用1
-    if (!baseTenantId) {
-      window.location.href = `${baseUrl}id=1&tenant=${tenantId}`
-    }
-
-    if (baseTenantId && !id) {
-      window.location.href = `${baseUrl}tenant=${baseTenantId}`
-    }
-
-    if (baseTenantId && id) {
-      window.location = window.location
+    const defaultTenantId = userState.userInfo.tenant?.[0]?.id
+    if (defaultTenantId) {
+      const currentUrl = new URL(window.location.href)
+      const currentTenant = getBaseInfo().tenantId
+
+      const filterList = userState.userInfo.tenant.filter((item) => item.id === currentTenant) || []
+      // 只有当tenant值不存在时才更新
+      if (!filterList?.length) {
+        currentUrl.searchParams.set('tenant', String(defaultTenantId))
+        window.history.replaceState(window.history.state, '', currentUrl.href)
+      }
     }
+    window.location.reload()
   }
 }
 
@@ -86,7 +84,12 @@ const setUserInfo = (data: any) => {
 
 const fetchUserInfo = () => {
   // 获取登录用户信息
-  return getMetaApi(META_SERVICE.Http).get('/platform-center/api/user/me')
+  return getMetaApi(META_SERVICE.Http).get('/platform-center/api/user/me', {
+    transformRequest: (data: any, headers: any) => {
+      delete headers['x-lowcode-org']
+      return data
+    }
+  })
 }
 
 const setTenantInfo = (id: any) => {

packages/common/composable/http/index.ts

@@ -117,7 +117,7 @@ const createAbortController = (config) => {
 
 // 取消所有进行中的请求
 const abortAllRequests = (message = '用户未登录，请求已取消') => {
-  abortControllers.forEach((controller, key) => {
+  abortControllers.forEach((controller) => {
     controller.abort(message)
   })
   abortControllers.clear()

packages/design-core/assets/default-user.svg

@@ -66,6 +66,7 @@ export default {
     flex: 2;
     .login-img {
       max-height: 500px;
+      min-height: 298px;
       width: 100%;
       height: 100%;
       background-image: url(../../assets/login-bg.svg);
@@ -83,6 +84,7 @@ export default {
       max-width: 440px;
       min-width: 340px;
       max-height: 500px;
+      min-height: 298px;
       width: 100%;
       height: 100%;
       background: #fff;