Merge pull request #1597 from opentiny/release/v2.8.x

Release/v2.8.x

Author: chilingling

designer-demo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.7.0",
+  "version": "2.8.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env vite",

designer-demo/src/composable/http/index.js

@@ -46,7 +46,7 @@ const preResponse = (res) => {
     return Promise.reject(res.data.error)
   }
 
-  return res.data?.data
+  return res.data?.data || res.data
 }
 
 const openLogin = () => {

mockServer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "publishConfig": {
     "access": "public"
   },

packages/block-compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-compiler",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "publishConfig": {
     "access": "public"
   },

packages/build/vite-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-config",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "",
   "type": "module",
   "main": "./index.js",

packages/build/vite-plugin-meta-comments/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",

packages/builtinComponent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",

packages/canvas/DesignCanvas/src/mcp/tools/addNode.ts

@@ -1,32 +1,23 @@
 import { z } from 'zod'
-import { useCanvas } from '@opentiny/tiny-engine-meta-register'
+import { useCanvas, useMaterial } from '@opentiny/tiny-engine-meta-register'
 import { utils } from '@opentiny/tiny-engine-utils'
 
 const { validateParams } = utils
 
-type NodeSchema = z.ZodObject<{
-  componentName: z.ZodString
-  props: z.ZodObject<Record<string, z.ZodTypeAny>, 'strip', z.ZodTypeAny>
-  children: z.ZodArray<z.ZodLazy<any>, 'many'>
-}>
-
-// eslint-disable-next-line @typescript-eslint/no-use-before-define
-const nodeArraySchema = z.lazy(() => nodeSchema)
-
-const nodeSchema: NodeSchema = z.object({
-  componentName: z.string().describe('The name of the component.'),
-  props: z.object({}).describe('The props of the component.'),
-  children: z.array(z.lazy(() => nodeArraySchema)).describe('The children of the component')
-})
-
 const inputSchema = z.object({
   parentId: z
     .string()
     .optional()
     .describe(
       'The id of the parent node. If not provided, the new node will be added to the root. if you don\'t know the parentId, you can use the tool "get_page_schema" to get the page schema. if you want to add to page root, just don\'t provide the parentId.'
     ),
-  newNodeData: z.lazy(() => nodeSchema).describe('The new node data.'),
+  newNodeData: z.object({
+    componentName: z.string().describe('The name of the component.'),
+    props: z.record(z.string(), z.any()).describe('The props of the component.'),
+    children: z
+      .array(z.record(z.string(), z.any()))
+      .describe('Array of child nodes; each child has the same shape as newNodeData (recursive tree).')
+  }),
   position: z
     .enum(['before', 'after'])
     .optional()
@@ -60,11 +51,6 @@ export const addNode = {
     const { props = {}, children = [] } = newNodeData
 
     const validateResult = validateParams(args, {
-      componentName: {
-        required: true,
-        message:
-          'Component name is required, if you don\'t know the component name, you can use the tool "get_component_list" to get the component detail.'
-      },
       parentId: {
         validator: (value: string) => {
           const parentNode = useCanvas().getNodeById(value)
@@ -87,27 +73,55 @@ export const addNode = {
       return validateResult.error
     }
 
+    const { getMaterial } = useMaterial()
+    const material = getMaterial(componentName)
+    const isEmptyPlainObject =
+      material &&
+      typeof material === 'object' &&
+      !Array.isArray(material) &&
+      Object.keys(material as Record<string, unknown>).length === 0
+
+    if (!newNodeData.componentName || isEmptyPlainObject) {
+      return {
+        isError: true,
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify({
+              status: 'error',
+              errorCode: 'COMPONENT_NAME_REQUIRED',
+              reason: 'Component name is required',
+              userMessage: 'Component name is required. Fetch the available component list.',
+              next_action: {
+                type: 'tool_call',
+                name: 'get_component_list',
+                args: {}
+              }
+            })
+          }
+        ]
+      }
+    }
+
+    const insertData = {
+      componentName,
+      props,
+      children
+    }
+
     useCanvas().operateNode({
       type: 'insert',
       parentId: parentId!,
       // @ts-ignore
-      newNodeData: {
-        componentName,
-        props,
-        children
-      },
+      newNodeData: insertData,
       position: position!,
       referTargetNodeId
     })
 
     const res = {
       status: 'success',
       message: `Node added successfully`,
-      data: {
-        componentName,
-        props,
-        children
-      }
+      data: insertData
     }
 
     return {

packages/canvas/DesignCanvas/src/mcp/tools/changeNodeProps.ts

@@ -2,9 +2,13 @@ import { z } from 'zod'
 import { useCanvas } from '@opentiny/tiny-engine-meta-register'
 
 const inputSchema = z.object({
-  id: z.string().describe('The id of the node to change the props of.'),
+  id: z
+    .string()
+    .describe(
+      'The id of the node to change the props of. if you don\'t know the id, you can use the tool "get_current_selected_node" to get the current selected node. or you can use the tool "get_page_schema" to get the page schema. when get the page schema, you can find the id in the "id" field.'
+    ),
   props: z
-    .object({})
+    .record(z.string(), z.any())
     .describe(
       'The props of the component. if you don\'t know available props, you can use the "get_component_detail" tool to get component detail and available props.'
     ),
@@ -13,6 +17,7 @@ const inputSchema = z.object({
 
 export const changeNodeProps = {
   name: 'change_node_props',
+  title: '修改节点属性',
   description:
     'Change the props of a node in the current TinyEngine low-code application. Use this when you need to change the props of a node in your application.',
   inputSchema: inputSchema.shape,
@@ -32,6 +37,37 @@ export const changeNodeProps = {
       props = {}
     }
 
+    const node = useCanvas().getNodeById(id)
+    if (!node) {
+      return {
+        content: [
+          {
+            isError: true,
+            type: 'text',
+            text: JSON.stringify({
+              errorCode: 'NODE_NOT_FOUND',
+              reason: `Node not found: ${id}`,
+              userMessage: `Node not found: ${id}. Fetch the available node list.`,
+              next_action: [
+                {
+                  type: 'tool_call',
+                  name: 'get_current_selected_node',
+                  args: {},
+                  when: 'you want to change the props of the current selected node'
+                },
+                {
+                  type: 'tool_call',
+                  name: 'get_page_schema',
+                  args: {},
+                  when: 'you want to change the props of the node with the specified id'
+                }
+              ]
+            })
+          }
+        ]
+      }
+    }
+
     useCanvas().operateNode({
       type: 'changeProps',
       id,

packages/canvas/DesignCanvas/src/mcp/tools/delNode.ts

@@ -2,11 +2,16 @@ import { z } from 'zod'
 import { useCanvas } from '@opentiny/tiny-engine-meta-register'
 
 const inputSchema = z.object({
-  id: z.string().describe('The id of the node to delete.')
+  id: z
+    .string()
+    .describe(
+      'The id of the node to delete. if you don\'t know the id, you can use the tool "get_current_selected_node" to get the current selected node. or you can use the tool "get_page_schema" to get the page schema. when get the page schema, you can find the id in the "id" field.'
+    )
 })
 
 export const delNode = {
   name: 'del_node',
+  title: '删除节点',
   description:
     'Delete a node from the current TinyEngine low-code application. Use this when you need to delete a node from your application.',
   inputSchema: inputSchema.shape,