@blocklet/pages-kit-block-studio 0.4.61 → 0.4.62

package/lib/cjs/utils/generate-wrapper-code.js

@@ -125,17 +125,25 @@ initPackResourceStates(({ states }: any) => {
 });
 
 router.get('/api/pages', async (req, res) => {
-  const { did, projectId, siteFrom } = req.query;
+  const { did, projectId } = req.query;
 
-  console.log('get state data', StateData);
-  return res.json(StateData.state);
+  if (process.env.USE_ONLINE_STATE !== 'true') {
+    console.log('get state data', StateData);
+    return res.json(StateData.state);
+  }
+
+  // use online state
   try {
     // Case 1: Using did
     if (did) {
       const data = tempStates.find((state) => state.blockletId === did);
+      console.log('get state data from did', did, data);
       return res.json(data);
     }
 
+    // Get siteFrom from environment variable
+    const siteFrom = process.env.PAGES_KIT_SITE_FROM;
+
     // Case 2: Using projectId
     const tmpProjectId = projectId || PROJECT_ID;
     if (tmpProjectId) {
@@ -158,10 +166,12 @@ router.get('/api/pages', async (req, res) => {
       // 使用 axios 发起请求
       const { data } = await axios.get(apiUrl, {
         params: {
-          secret: 'chunchunchunchun',
+          secret: '${project.npmSecret}',
         },
       });
 
+      console.log('get state data from projectId', data);
+
       return res.json(data);
     }
 
@@ -320,7 +330,7 @@ function getCustomComponentPropertyType(type) {
         return 'any';
     return 'any';
 }
-const ALLOWED_PROPERTY_TYPES = ['string', 'multiline', 'url', 'json', 'yaml'];
+const ALLOWED_PROPERTY_TYPES = ['string', 'multiline', 'url', 'json', 'yaml', 'array'];
 function generatePageDataTypes(state) {
     // 递归生成TypeScript类型属性
     function generateTsTypeProperties(properties) {
@@ -353,6 +363,15 @@ function generatePageDataTypes(state) {
                     typeStr = 'any';
                 }
             }
+            else if (prop.data.type === 'array') {
+                if (prop.data.subProperties && Object.keys(prop.data.subProperties).length > 0) {
+                    const subProps = generateTsTypeProperties(prop.data.subProperties).filter(Boolean).join('\n      ');
+                    typeStr = `{\n      ${subProps}\n    }[];`;
+                }
+                else {
+                    typeStr = 'any[]';
+                }
+            }
             else {
                 typeStr = 'any';
             }
@@ -403,6 +422,14 @@ function generatePageDataTypes(state) {
                         const subProps = generateTsTypeProperties(prop.data.subProperties).filter(Boolean).join('\n      ');
                         return `    "${key}"?: {\n      ${subProps}\n    };`;
                     }
+                    // 处理数组类型
+                    if (prop.data?.type === 'array') {
+                        if (prop.data?.subProperties && Object.keys(prop.data.subProperties).length > 0) {
+                            const subProps = generateTsTypeProperties(prop.data.subProperties).filter(Boolean).join('\n      ');
+                            return `    "${key}"?: {\n      ${subProps}\n    }[];`;
+                        }
+                        return `    "${key}"?: any[];`;
+                    }
                     return `    "${key}"?: ${getCustomComponentPropertyType(prop.data?.type)};`;
                 })
                     .filter(Boolean)
@@ -493,6 +520,16 @@ function generatePageDataJsonSchemas(state) {
                     schemaProperties[key] = {};
                 }
             }
+            else if (prop.data.type === 'array') {
+                // 处理数组类型 - 数组元素始终是对象
+                schemaProperties[key] = {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: prop.data.subProperties ? generateJsonSchemaProperties(prop.data.subProperties) : {},
+                    },
+                };
+            }
             else {
                 schemaProperties[key] = { type: 'string' };
             }
@@ -560,6 +597,16 @@ function generatePageDataJsonSchemas(state) {
                             properties[key] = {};
                         }
                     }
+                    else if (prop.data?.type === 'array') {
+                        // 处理数组类型 - 数组元素始终是对象
+                        properties[key] = {
+                            type: 'array',
+                            items: {
+                                type: 'object',
+                                properties: prop.data?.subProperties ? generateJsonSchemaProperties(prop.data.subProperties) : {},
+                            },
+                        };
+                    }
                     else {
                         properties[key] = { type: 'string' };
                     }