Merge branch 'opentiny:develop' into feat/ai-completions

Author: betterdancing

docs/advanced-features/new-ai-plugin-usage.md

@@ -61,8 +61,14 @@ MCP工具管理面板允许用户：
 [META_APP.Robot]: {
   options: {
     customCompatibleAIModels: [
-      { label: 'SiliconFlow：DeepSeek-V3', value: 'deepseek-ai/DeepSeek-V3', manufacturer: 'siliconflow' },
-      { label: 'Qwen：qwen-max', value: 'qwen-max', manufacturer: 'qwen' },
+      {
+        label: 'DeepSeek',
+        value: 'https://api.deepseek.com/v1',
+        model: [
+          { label: 'deepseek-chat', value: 'deepseek-chat', maxTokens: 64000 },
+          { label: 'deepseek-reasoner', value: 'deepseek-reasoner', maxTokens: 64000 }
+        ]
+      }
     ]
   }
 },

docs/extension-capabilities-tutorial/mcpService.md

@@ -430,20 +430,22 @@ mcpService.setOptions(remoteConfig)
 
 ### 高级配置
 
-```typescript
+<pre>
+<code>
 import { getMetaApi } from '@opentiny/tiny-engine-meta-register'
 
 const mcpService = getMetaApi('engine.service.mcp')
 
 const advancedConfig = {
-  proxyUrl: process.env.MCP_PROXY_URL || 'http://localhost:3000/mcp',
-  connectToAgentServer: process.env.NODE_ENV === 'production',
+  proxyUrl: process<wbr>.env.MCP_PROXY_URL || 'http://localhost:3000/mcp',
+  connectToAgentServer: process<wbr>.env.NODE_ENV === 'production',
   reconnectAttempts: 5,
   reconnectInterval: 2000
 }
 
 mcpService.setOptions(advancedConfig)
-```
+</code>
+</pre>
 
 ## 最佳实践
 

packages/canvas/render/src/data-function/parser.ts

@@ -166,7 +166,7 @@ export const generateFn = (innerFn, context?) => {
     }
 
     // 这里注意如果innerFn返回的是一个promise则需要捕获异常，重新返回默认一条空数据
-    if (result.then && typeof result.then === 'function') {
+    if (result?.then && typeof result.then === 'function') {
       result = new Promise((resolve) => {
         result.then(resolve).catch((error) => {
           globalNotify({

packages/common/component/BlockDeployDialog.vue

@@ -72,6 +72,7 @@
 
 <script lang="ts">
 import { reactive, ref, watch } from 'vue'
+import type { Component } from 'vue'
 import {
   Checkbox as TinyCheckbox,
   Input as TinyInput,
@@ -87,13 +88,13 @@ import VueMonaco from './VueMonaco.vue'
 
 export default {
   components: {
-    TinyCheckbox,
-    TinyButton,
+    TinyCheckbox: TinyCheckbox as Component,
+    TinyButton: TinyButton as Component,
     TinyDialogBox,
     TinyForm,
     TinyInput,
     TinyFormItem,
-    TinyPopover,
+    TinyPopover: TinyPopover as Component,
     VueMonaco
   },
   props: {

packages/common/component/BlockLinkEvent.vue

@@ -17,16 +17,17 @@
   </tiny-popover>
 </template>
 
-<script lang="jsx">
+<script lang="tsx">
 import { reactive, computed } from 'vue'
+import type { Component } from 'vue'
 import { capitalize } from '@vue/shared'
 import { extend } from '@opentiny/vue-renderless/common/object'
 import { Input as TinyInput, Form as TinyForm, FormItem as TinyFormItem, Popover as TinyPopover } from '@opentiny/vue'
 import { useLayout, useModal, useCanvas, useBlock } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
-    TinyPopover
+    TinyPopover: TinyPopover as Component
   },
   props: {
     data: {

packages/common/component/BlockLinkField.vue

@@ -30,15 +30,16 @@
   </tiny-popover>
 </template>
 
-<script lang="jsx">
+<script lang="tsx">
 import { reactive, computed } from 'vue'
+import type { Component } from 'vue'
 import { extend } from '@opentiny/vue-renderless/common/object'
 import { Input as TinyInput, Popover as TinyPopover } from '@opentiny/vue'
 import { useLayout, useModal, useCanvas, useBlock, useHistory } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
-    TinyPopover
+    TinyPopover: TinyPopover as Component
   },
   props: {
     data: {

packages/common/component/ConfigItem.vue

@@ -102,6 +102,7 @@
 
 <script lang="ts">
 import { inject, computed, watch, ref, reactive, provide } from 'vue'
+import type { Component } from 'vue'
 import { Popover, Tooltip } from '@opentiny/vue'
 import { IconWriting, IconHelpCircle, IconPlusCircle } from '@opentiny/vue-icon'
 import { typeOf } from '@opentiny/vue-renderless/common/type'
@@ -130,8 +131,8 @@ const hasRule = (required: any, rules: string | any[]) => {
 export default {
   components: {
     MultiTypeSelector,
-    TinyPopover: Popover,
-    TinyTooltip: Tooltip,
+    TinyPopover: Popover as Component,
+    TinyTooltip: Tooltip as Component,
     IconWriting: IconWriting(),
     IconPlusCircle: IconPlusCircle(),
     IconHelpCircle: IconHelpCircle()

packages/common/component/I18nInput.vue

@@ -36,6 +36,7 @@
 
 <script lang="ts">
 import { computed, ref, watchEffect } from 'vue'
+import type { Component } from 'vue'
 import { useTranslate } from '@opentiny/tiny-engine-meta-register'
 import { Input, Popover } from '@opentiny/vue'
 import { IconClose } from '@opentiny/vue-icon'
@@ -46,7 +47,7 @@ export default {
   components: {
     TinyInput: Input,
     BindI18n,
-    TinyPopover: Popover,
+    TinyPopover: Popover as Component,
     IconClose: IconClose()
   },
   inheritAttrs: false,

packages/common/component/LifeCycles.vue

@@ -84,8 +84,9 @@
   </tiny-dialog-box>
 </template>
 
-<script lang="jsx">
+<script lang="tsx">
 import { reactive, ref, watchEffect, onBeforeUnmount } from 'vue'
+import type { Component } from 'vue'
 import { Button, DialogBox, Popover, Search } from '@opentiny/vue'
 import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
@@ -100,7 +101,7 @@ const { OPEN_DELAY } = constants
 
 export default {
   components: {
-    TinyPopover: Popover,
+    TinyPopover: Popover as Component,
     TinyDialogBox: DialogBox,
     TinySearch: Search,
     TinyButton: Button,

packages/common/component/LinkButton.vue

@@ -17,9 +17,10 @@
 
 <script lang="ts">
 import { TinyTooltip } from '@opentiny/vue'
+import type { Component } from 'vue'
 export default {
   components: {
-    TinyTooltip
+    TinyTooltip: TinyTooltip as Component
   },
   props: {
     href: {