@cloudbase/lowcode-builder 1.8.96 → 1.8.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.96",
+  "version": "1.8.98",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.75",
+    "@cloudbase/cals": "^1.0.79",
     "@cloudbase/lowcode-generator": "^1.8.29",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -549,7 +549,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dcb4b774286f577116be.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.acef94ce4b0574004da6.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -1,3 +1,5 @@
+// 必须优先初始化数据源
+import '<%= subLevelPath %>../datasources/index';
 import { observable } from 'mobx'
 import { createMpApp } from '@cloudbase/weda-client';
 import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'

package/template/mp/app.js

@@ -1,8 +1,6 @@
-// 必须优先初始化数据源
-import '<%= wedaRootRelativePath %>datasources/index';
+import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 <%= importor.lifecycle? `import lifeCycle from '${wedaRootRelativePath}lowcode/lifecycle'` : "const lifeCycle = {}" %>
 // 引入数据源管理器并进行初始化
-import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 import {
   EXTRA_API,
   createStateDataSourceVar,

package/template/mp/common/query.js

@@ -2,6 +2,23 @@ import { observable, autorun, toJS } from 'mobx';
 import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } from './util';
 import { Event } from './event-emitter';
 
+
+const QUERY_RESOURCE = {
+  SQL : 'mysql-plugin',
+  SQLSERVER : 'mssql-plugin',
+  CLOUDCONNECTOR : 'apis-plugin',
+}
+
+const QUERY_PATH =  {
+  SQL : '/WeDa/Query/V1/RunPluginQuery',
+  SQLSERVER : '/WeDa/Query/V1/RunPluginQuery',
+  CLOUDCONNECTOR : '/WeDa/Connector/v1/RunApisQuery',
+}
+
+const KEYS = ['id', 'label', 'description', 'data', 'error', 'isFetching', 'trigger', 'reset'];
+
+const GENERALFUNC = 'general-func'
+
 export class Query {
   _schema = {};
   #schema;
@@ -17,9 +34,9 @@ export class Query {
   #eventHandlerMap = {};
   #action = () => {};
   #runQueryMap = {
-    sql: { QueryResource: 'mysql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
-    sqlserver: { QueryResource: 'mssql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
-    'cloud-connector': { QueryResource: 'apis-plugin', QueryPath: '/WeDa/Connector/v1/RunApisQuery' },
+    sql: { QueryResource: QUERY_RESOURCE.SQL, QueryPath: QUERY_PATH.SQL },
+    sqlserver: { QueryResource: QUERY_RESOURCE.SQLSERVER, QueryPath: QUERY_PATH.SQLSERVER },
+    'cloud-connector': { QueryResource: QUERY_RESOURCE.CLOUDCONNECTOR, QueryPath: QUERY_PATH.CLOUDCONNECTOR },
   };
   constructor({ schema, context, options = {} }) {
     const { looseError = false } = options;
@@ -64,85 +81,93 @@ export class Query {
 
     const { $w } = this.#context;
 
-    this.#action = this.#isRunQueryType
-      ? async function (data) {
-          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';
-                      }
-                    }
+    const runQueryType = async function (data) {
+      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),
+              });
+            }
 
-          const Data = await $w.cloud.callWedaApi({
-            action: 'RunQuery',
-            CallQuery: true,
-            ...(this.#runQueryMap[this.#schema.type] || this.#runQueryMap['sql']),
-            EnvId: requestData.EnvId,
-            QueryName: requestData.Name,
-            data: requestData,
-          });
+            return list;
+          }, []) || [],
+        ),
+      };
 
-          // const Data = await $w.cloud.callWedaApi({
-          //   action: 'RunPluginQuery',
-          //   data: {
-          //     MainAppId: $w.app.id,
-          //     ...requestData
-          //   },
-          // });
+      const Data = await $w.cloud.callWedaApi({
+        action: 'RunQuery',
+        CallQuery: true,
+        ...(this.#runQueryMap[this.#schema.type] || this.#runQueryMap['sql']),
+        EnvId: requestData.EnvId,
+        QueryName: requestData.Name,
+        data: requestData,
+      });
 
-          const { ExecuteResultList = [], Total, Payload } = Data || {};
+      // const Data = await $w.cloud.callWedaApi({
+      //   action: 'RunPluginQuery',
+      //   data: {
+      //     MainAppId: $w.app.id,
+      //     ...requestData
+      //   },
+      // });
 
-          let payload = Payload;
-          try {
-            if (Payload) {
-              payload = JSON.parse(Payload);
-            }
-          } catch (e) {}
-          return {
-            ...(this.#schema.type === 'cloud-connector'
-              ? payload
-              : {
-                  records: ExecuteResultList.map((item) => JSON.parse(item)),
-                  total: Total || ExecuteResultList.length,
-                }),
-          };
+      const { ExecuteResultList = [], Total, Payload } = Data || {};
+
+      let payload = Payload;
+      try {
+        if (Payload) {
+          payload = JSON.parse(Payload);
         }
-      : this.#schema.handler;
+      } catch (e) {}
+      return {
+        ...(this.#schema.type === 'cloud-connector'
+          ? payload
+          : {
+              records: ExecuteResultList.map((item) => JSON.parse(item)),
+              total: Total || ExecuteResultList.length,
+            }),
+      };
+    }
+
+    this.#action = async function (data,additionalScope){
+      return this.#isRunQueryType
+      ? runQueryType.call(this,data) 
+      : this.#schema.type === GENERALFUNC 
+      ? this.#schema.handler.call(this,data,additionalScope)
+      : this.#schema.handler.call(this,data);
+    }
+    
+    
     this.#eventHandlerMap = Object.entries(
       createEventHandlers(this.#schema.eventHandlers || {}, {
         looseError: looseError,
@@ -183,7 +208,7 @@ export class Query {
   }
   async trigger(additionalScope, options = {}) {
     this.#triggered = true;
-    return this.#innerTrigger(this.#resolveParams(additionalScope), options);
+    return this.#innerTrigger(this.#resolveParams(additionalScope),additionalScope, options);
   }
   reset() {
     this.#observableValue.data = null;
@@ -202,12 +227,12 @@ export class Query {
     return this.#schema;
   }
 
-  async #innerTrigger(args, options = {}) {
+  async #innerTrigger(args, additionalScope,options = {}) {
     this.#currentRequestKey = Date.now();
     const key = this.#currentRequestKey;
     try {
       this.#observableValue.isFetching = true;
-      const res = await this.#action(...args);
+      const res = await this.#action(args?.[0],additionalScope);
       if (key === this.#currentRequestKey) {
         this.#observableValue.isFetching = false;
         this.#observableValue.data = res;
@@ -260,7 +285,6 @@ export class Query {
   }
 
   toJSON() {
-    const KEYS = ['id', 'label', 'description', 'data', 'error', 'isFetching', 'trigger', 'reset'];
     return KEYS.reduce((obj, key) => {
       obj[key] = this[key];
       return obj;

package/template/mp/common/util.js

@@ -522,6 +522,11 @@ export function formatErrorMsg(e) {
 export async function checkAuth(app, appId, $page) {
   <% if(skipCheckAuth){ %> return true <% } %>
 
+  // 免密登录
+	if (await app?.cloud?.judgePasswordFreeLogin()) {
+		return true;
+	}
+
 	const loginConfig = await getLoginConfig();
 	const hasPhoneLoginType = loginConfig?.miniprogram?.find(v => v.type === 'miniprogram_phone');
 	const hasOpenIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'openid_login');

package/template/mp/package.json

@@ -3,9 +3,10 @@
   "version": "1.0.8",
   "scripts": {},
   "dependencies": {<% if(importJSSDK) {%>
-		"@cloudbase/js-sdk": "2.5.41-beta.0",<% } %>
-		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.31",
+		"@cloudbase/js-sdk": "2.5.42-beta.0",<%
+    } %>
+		"@cloudbase/oauth": "0.1.1-alpha.6",
+    "@cloudbase/weda-client": "1.0.32",
     "@cloudbase/weda-cloud-sdk": "1.0.61",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",

package/template/mp/packages/$wd_system/pages/login/index.wxml

@@ -1,5 +1,5 @@
 <page-meta page-style="{{pageStyle}}">
-  <view wx:if="{{!initing && !error}}"  id="wd-page-root" data-weui-theme="light">
+  <view wx:if="{{!initing && !error}}"  id="wd-page-root" class="wd-mp-root" data-weui-theme="light">
     <view id="id33" style="width:90%;margin:0px auto;display:flex;flex-direction:column;max-width:50rem;" class="login-class">
       <view id="id44" style="margin:80px 0px;">
         <image id="id15" style="margin:0px auto;display:flex;justify-content:center;width: 120px;height: 120px;" class="weda-ui weda-image" mode="aspectFit" src="{{settingData.logo}}" />

package/template/mp/page/index.json

@@ -1,3 +1,4 @@
 {
+  "renderer": "webview",
   "usingComponents": <%= JSON.stringify(usingComponents, undefined, 2)%><%= componentPlaceholder? `, "componentPlaceholder": ${JSON.stringify(componentPlaceholder, undefined, 2)}` : "" %><%= extra %>
 }