Merge branch 'develop' of https://github.com/betterdancing/tiny-engine into feat/resources

Author: betterdancing

packages/canvas/render/src/builtin/CanvasCollection.ts

@@ -183,7 +183,7 @@ return new Promise((resolve, reject) => {
 this.dataSourceMap.${sourceName}.load().then((res) => {
   // 如果按照数据源面板的建议格式编写dataHandler
   // 那么dataSourceMap的res格式应该是：{ code: string, msg: string, data: {items: any[], total: number} }
-  resolve({ result: res.data.items, page: { total: res.data.total } });
+  resolve({ result: res?.data?.items || res?.data?.data || res?.data, page: { total: res?.data?.total || res?.data?.data?.length || res?.data?.length } });
 });
 });
 }`

packages/plugins/datasource/src/DataSourceForm.vue

@@ -210,12 +210,14 @@ export default {
     }
 
     const save = async () => {
-      try {
-        // await validate() 如果验证不通过会抛出异常，而不是返回 false
-        await getServiceForm().validate()
-      } catch (error) {
-        activeTabChange('remote')
-        return
+      if (state.dataSource.data.type === 'remote') {
+        try {
+          // await validate() 如果验证不通过会抛出异常，而不是返回 false
+          await getServiceForm().validate()
+        } catch (error) {
+          activeTabChange('remote')
+          return
+        }
       }
       getDataSourceName().validate(async (valid) => {
         if (valid) {

packages/plugins/datasource/src/DataSourceList.vue

@@ -70,10 +70,7 @@ export default {
     const openDataSourceForm = (item, index) => {
       activeIndex.value = index
       fetchDataSourceDetail(item.id).then((data) => {
-        const editData = { ...data, data: { ...data.data, type: 'remote' } } || {
-          ...item,
-          data: { ...item.data, type: 'remote' }
-        }
+        const editData = data || item
         emit('edit', editData)
         getServiceForm()?.clearValidate()
       })

packages/plugins/datasource/src/DataSourceType.vue

@@ -44,6 +44,10 @@ export default {
       {
         name: '远程数据源',
         value: 'remote'
+      },
+      {
+        name: '静态数据源',
+        value: 'field'
       }
     ]
 

packages/plugins/robot/src/mcp/utils.ts

@@ -52,6 +52,25 @@ export const serializeError = (err: unknown): string => {
   }
 }
 
+const formatToolResult = (
+  toolResult: string | { type: 'text'; text: string } | Array<{ type: 'text'; text: string }>
+) => {
+  let result: any = toolResult
+  if (Array.isArray(result) && result.length === 1) {
+    result = result[0]
+  }
+
+  if (typeof result === 'object' && result.type === 'text' && result.text) {
+    result = result.text
+  }
+
+  if (typeof result === 'string') {
+    return result
+  }
+
+  return JSON.stringify(result)
+}
+
 const handleToolCall = async (
   res: LLMResponse,
   tools: RequestTool[],
@@ -99,8 +118,7 @@ const handleToolCall = async (
         toolCallResult = serializeError(error)
       }
       toolMessages.push({
-        type: 'text',
-        content: toolCallResult,
+        content: formatToolResult(toolCallResult),
         role: 'tool',
         tool_call_id: tool.id
       })

packages/vue-generator/src/templates/vue-template/templateFiles/src/lowcodeConfig/dataSource.js

@@ -25,7 +25,9 @@ const createFn = (fnContent) => {
   }
 }
 
-const globalDataHandle = dataSources.dataHandler ? createFn(dataSources.dataHandler.value) : (res) => res
+const globalDataHandle = dataSources.dataHandler
+  ? createFn(dataSources.dataHandler.value)
+  : (res) => Promise.resolve({ data: res })
 
 const load = (http, options, dataSource, shouldFetch) => (params, customUrl) => {
   // 如果没有配置远程请求，则直接返回静态数据，返回前可能会有全局数据处理

packages/vue-generator/test/testcases/element-plus-case/expected/appdemo01/src/lowcodeConfig/dataSource.js

@@ -25,7 +25,9 @@ const createFn = (fnContent) => {
   }
 }
 
-const globalDataHandle = dataSources.dataHandler ? createFn(dataSources.dataHandler.value) : (res) => res
+const globalDataHandle = dataSources.dataHandler
+  ? createFn(dataSources.dataHandler.value)
+  : Promise.resolve({ data: res })
 
 const load = (http, options, dataSource, shouldFetch) => (params, customUrl) => {
   // 如果没有配置远程请求，则直接返回静态数据，返回前可能会有全局数据处理

packages/vue-generator/test/testcases/generator/expected/appdemo01/src/lowcodeConfig/dataSource.js

@@ -25,7 +25,9 @@ const createFn = (fnContent) => {
   }
 }
 
-const globalDataHandle = dataSources.dataHandler ? createFn(dataSources.dataHandler.value) : (res) => res
+const globalDataHandle = dataSources.dataHandler
+  ? createFn(dataSources.dataHandler.value)
+  : Promise.resolve({ data: res })
 
 const load = (http, options, dataSource, shouldFetch) => (params, customUrl) => {
   // 如果没有配置远程请求，则直接返回静态数据，返回前可能会有全局数据处理