@cloudbase/lowcode-builder 1.8.65 → 1.8.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.65",
+  "version": "1.8.67",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -46,8 +46,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.51",
-    "@cloudbase/lowcode-generator": "^1.8.19",
+    "@cloudbase/cals": "^1.0.54",
+    "@cloudbase/lowcode-generator": "^1.8.20",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3897a073a34a755db5d0.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.60fc8d66d8b46f3c1b33.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -41,7 +41,7 @@ const mainAppKey = '__weappsMainApp'
           key: '${l.key||''}',
           sourceKey: '${ l.sourceKey||"" }',
           handler: ${l.generateHandler(subLevelPath) || 'undefined'},
-          args: ${stringifyObj(l.args||{}, {depth: null})},
+          args: ${JSON.stringify(l.args||{}, undefined, 2)},
           argsBinds: {${printBoundData(l.argsBinds)}}
         }`
       }).join(',')}
@@ -98,7 +98,7 @@ function createGlboalApi() {
   let dataset = createDataset('$global')
   dataset.query = generateDatasetQuery({<% Object.entries(appQuery).map(([id, item])=>{%>
     <%= id %>: { <% const { dataBinds, eventHandlers, handler, ...rest } = item %>
-      ...(<%= stringifyObj(rest, {depth: null}) %>),
+      ...(<%= JSON.stringify(rest, undefined, 2) %>),
       handler: <%= handler %>,
       dataBinds: {<%= printBoundData(dataBinds) %>},
       eventHandlers: {<% printEventHandler(eventHandlers) %>}

package/template/mp/common/query.js

@@ -62,52 +62,66 @@ export class Query {
     this.#action =
       this.#schema.type === 'sql' || this.#schema.type === 'sqlserver'
         ? async function (data) {
-            const Data = await $w.cloud.callWedaApi({
-              action: 'RunPluginQuery',
-              data: {
-                EnvId: $w.env.envId,
-                MainAppId: $w.app.id,
-                Name: data.sqlTemplateId,
-                Parameter: JSON.stringify(
-                  Object.entries(data.params || {}).reduce((list, [key, value]) => {
-                    if (value !== undefined) {
-                      let type = 'OBJECT';
-                      const typeofValue = typeof value;
-                      switch (typeofValue) {
-                        case 'boolean': {
-                          type = 'BOOLEAN';
-                          break;
-                        }
-                        case 'number': {
-                          type = 'NUMBER';
-                          break;
-                        }
-                        case 'string': {
-                          type = 'STRING';
-                          break;
-                        }
-                        default: {
-                          if (Array.isArray(value)) {
-                            type = 'ARRAY';
-                          } else {
-                            type = 'OBJECT';
-                          }
+            const requestData = {
+              EnvId: $w.env.envId,
+              Name: data.sqlTemplateId,
+              Parameter: JSON.stringify(
+                Object.entries(data.params || {}).reduce((list, [key, value]) => {
+                  if (value !== undefined) {
+                    let type = 'OBJECT';
+                    const typeofValue = typeof value;
+                    switch (typeofValue) {
+                      case 'boolean': {
+                        type = 'BOOLEAN';
+                        break;
+                      }
+                      case 'number': {
+                        type = 'NUMBER';
+                        break;
+                      }
+                      case 'string': {
+                        type = 'STRING';
+                        break;
+                      }
+                      default: {
+                        if (Array.isArray(value)) {
+                          type = 'ARRAY';
+                        } else {
+                          type = 'OBJECT';
                         }
                       }
-
-                      list.push({
-                        Key: key,
-                        Type: type,
-                        Value: type === 'STRING' ? value : JSON.stringify(value),
-                      });
                     }
 
-                    return list;
-                  }, []) || [],
-                ),
-              },
+                    list.push({
+                      Key: key,
+                      Type: type,
+                      Value: type === 'STRING' ? value : JSON.stringify(value),
+                    });
+                  }
+
+                  return list;
+                }, []) || [],
+              ),
+            };
+
+            const Data = await $w.cloud.callWedaApi({
+              action: 'RunQuery',
+              CallQuery: true,
+              QueryResource: this.#schema.type === 'sql' ? 'mysql-plugin' : 'mssql-plugin',
+              QueryPath: '/WeDa/Query/V1/RunPluginQuery',
+              EnvId: requestData.EnvId,
+              QueryName: requestData.Name,
+              data: requestData,
             });
 
+            // const Data = await $w.cloud.callWedaApi({
+            //   action: 'RunPluginQuery',
+            //   data: {
+            //     MainAppId: $w.app.id,
+            //     ...requestData
+            //   },
+            // });
+
             const { ExecuteResultList = [], Total } = Data || {};
             return {
               records: ExecuteResultList.map((item) => JSON.parse(item)),

package/template/mp/component/index.js

@@ -16,7 +16,7 @@ const handlers = {<% handlers.forEach(h => {%>
 
 const libCode = '<%= materialName %>'
 
-const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
+const widgetProps = <%= JSON.stringify(widgetProps, undefined, 2) %>
 
 <% function printBoundData(boundData={}) {
   const list = []
@@ -35,7 +35,7 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
       key: '<%= l.key %>',
       sourceKey: '<%= l.sourceKey %>',
       handler: <%= l.generateHandler('../') %>,
-      args: <%= stringifyObj(l.args, {depth: null}) %>,
+      args: <%= JSON.stringify(l.args, undefined, 2) %>,
       argsBinds: { <%= printBoundData(l.argsBinds) %>}
     },<%})%>
   ],<%})%>

package/template/mp/page/data.js

@@ -1 +1 @@
-export const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
+export const widgetProps = <%= JSON.stringify(widgetProps, undefined, 2) %>

package/template/mp/page/index.js

@@ -28,7 +28,7 @@ import { widgetProps } from './data'
           key: '${l.key||''}',
           sourceKey: '${ l.sourceKey||"" }',
           handler: ${l.generateHandler(subLevelPath) || 'undefined'},
-          args: ${stringifyObj(l.args||{}, {depth: null})},
+          args: ${JSON.stringify(l.args||{}, undefined, 2)},
           argsBinds: {${printBoundData(l.argsBinds)}}
         }`
       }).join(',')}
@@ -49,7 +49,7 @@ const dataBinds = {
 
 const query = {<% Object.entries(query).map(([id, item])=>{%>
   <%= id %>: { <% const {dataBinds={}, eventHandlers, handler, ...rest } = item %>
-    ...(<%= stringifyObj(rest, {depth: null}) %>),
+    ...(<%= JSON.stringify(rest, undefined, 2) %>),
     handler: <%= handler %>,
     dataBinds: {<%= printBoundData(dataBinds) %>},
     eventHandlers: {<% printEventHandler(eventHandlers) %>}
@@ -57,7 +57,7 @@ const query = {<% Object.entries(query).map(([id, item])=>{%>
 }
 
 const eventFlows = [<% eventFlows.map(flow => {%> { <% const { eventHandlers, ...rest } = flow %>
-  ...(<%= stringifyObj(rest, {depth: null}) %>),
+  ...(<%= JSON.stringify(rest, undefined, 2) %>),
   eventHandlers: {<% printEventHandler(eventHandlers) %>}
 },<%}) %>
 ]
@@ -75,6 +75,6 @@ createPage({
   handlers,
   query,
   eventFlows,
-  pageAttributes: <%= pageAttributes? stringifyObj(pageAttributes, {depth: null}):'{}' %>,
+  pageAttributes: <%= pageAttributes? JSON.stringify(pageAttributes):'{}' %>,
   resetShare: <%= resetShare %>
 })

package/template/webpack/web.prod.js

@@ -159,7 +159,7 @@ module.exports = function (options) {
     },
     devtool: devtool,
     resolve: {
-      extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.scss', '.css'],
+      extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.mjs', '.scss', '.css'],
       modules: [...resolveModules],
       symlinks: false,
       cacheWithContext: false,
@@ -184,6 +184,11 @@ module.exports = function (options) {
             /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring)|(@react-hookz))|gsd-kbone-react/,
           use: ['happypack/loader?id=babel'],
         },
+        {
+          test: /node_modules\/@loadable\/component\/.*\.mjs$/,
+          include: /node_modules/,
+          type: 'javascript/auto',
+        },
         {
           test: /\.(scss|sass)$/,
           use: [