Merge branch 'opentiny:develop' into fix/model-driven

Author: betterdancing

packages/design-core/src/preview/src/previewDefaultRegistry.js

@@ -11,6 +11,8 @@
  */
 
 import { GenerateCodeService, Breadcrumb, Media, Lang, HttpService } from '../../../re-export'
+const isDevelopEnv = import.meta.env.MODE?.includes('dev')
+const useAuth = import.meta.env.VITE_AUTH === 'true'
 
 export default {
   root: {
@@ -87,7 +89,8 @@ export default {
         oppositeTheme: 'light'
       }
     ],
-    enableTailwindCSS: true
+    enableTailwindCSS: true,
+    enableLogin: useAuth || !isDevelopEnv
   },
   toolbars: [Breadcrumb, Media, Lang]
 }

packages/plugins/block/src/BlockSetting.vue

@@ -252,7 +252,8 @@ export default {
             page_content: item.content,
             id: item.blockId || item.block_id,
             history: item.id,
-            name: item.label
+            name: item.label,
+            previewType: 'page'
           },
           true
         )

packages/plugins/page/src/PageHistory.vue

@@ -57,7 +57,8 @@ export default {
         const params = {
           ...item,
           id: Number(item.page),
-          history: item.id
+          history: item.id,
+          previewType: 'page'
         }
         params.ancestors = await getFamily(params)
         previewPage(params, true)

packages/workspace/application-center/src/Main.vue

@@ -208,7 +208,18 @@ export default {
 
     const openApplication = (template) => {
       const href = window.location.href.split('?')[0] || './'
-      window.open(`${href}?type=app&id=${template.id}&tenant=${template.tenantId || queryParams.get('tenant')}`)
+      const newUrl = `${href}?type=app&id=${template.id}&tenant=${template.tenantId || queryParams.get('tenant')}`
+      if (window.self !== window.top) {
+        window.parent.postMessage(
+          {
+            type: 'openNewTab',
+            url: newUrl
+          },
+          '*'
+        )
+      } else {
+        window.open(newUrl)
+      }
     }
 
     const typeClick = (type) => {