@cloudbase/lowcode-builder 0.1.10 → 0.1.13

package/lib/builder/mp/index.js

@@ -409,6 +409,7 @@ async function generateFramework(appData, outDir, ctx) {
                             .sort((item) => (item.isHome ? -1 : 1))
                             .map((item) => ({
                             id: item.id,
+                            type: item.data.isCustomLoginPage ? 'login' : '',
                         })),
                     }),
                 },

package/lib/builder/mp/wxml.js

@@ -55,9 +55,9 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
         ];
     }
     function createXml(widgets, parent = null, parentForNodes = []) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const elements = [];
-        for (const id in widgets) {
+        for (const id of Object.keys(widgets)) {
             const { xComponent, xProps, properties, xIndex, genericComp } = widgets[id];
             const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'], } = xProps || {};
             const data = { ...data0 };
@@ -77,7 +77,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 }
                 continue;
             }
-            const componentKey = xComponent.moduleName + ':' + xComponent.name;
+            const componentKey = `${xComponent.moduleName}:${xComponent.name}`;
             const helpMsg = `Please check component(${id}) in component tree of ${docTag}.`;
             const materialLib = ctx.materialLibs.find((lib) => lib.name === xComponent.moduleName);
             const miniprogramPlugin = (_a = ctx.miniprogramPlugins) === null || _a === void 0 ? void 0 : _a.find((plugin) => plugin.name === xComponent.moduleName);
@@ -94,7 +94,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             }
             // eslint-disable-next-line prefer-const
             let { tagName, path } = (0, materials_1.getWxmlTag)(xComponent, ctx, nameMangler);
-            if (genericComp && genericComp.propName) {
+            if (genericComp === null || genericComp === void 0 ? void 0 : genericComp.propName) {
                 tagName = getGenericCompTagName(genericComp.propName);
                 componentGenerics[tagName] = { default: path || tagName };
             }
@@ -102,7 +102,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 usingComponents[tagName] = path;
             }
             let curForNodes = parentForNodes;
-            if (directives.waFor && directives.waFor.value) {
+            if ((_b = directives.waFor) === null || _b === void 0 ? void 0 : _b.value) {
                 curForNodes = [...curForNodes, id];
             }
             const attrPrefix = `${wxmlDataPrefix.widgetProp}${id}${curForNodes
@@ -126,7 +126,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                     _order: xIndex || 0,
                     _parent: null,
                 };
-                if (directives.waIf && directives.waIf.value) {
+                if ((_c = directives.waIf) === null || _c === void 0 ? void 0 : _c.value) {
                     slotNode.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
                 }
                 elements.push(slotNode);
@@ -137,6 +137,8 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 name: tagName,
                 attributes: {
                     id: idAttr,
+                    bindattached: '__handlerAttached__',
+                    binddetached: '__handlerDetached__',
                     style: `{{${attrPrefix}.style}}`,
                     [(0, mp_1.getClassAttrName)(tagName)]: `{{${attrPrefix}.className}}`,
                 },
@@ -148,10 +150,10 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             if (mustEmptyStyle) {
                 delete node.attributes.style;
             }
-            if (directives.waIf && directives.waIf.value) {
+            if ((_d = directives.waIf) === null || _d === void 0 ? void 0 : _d.value) {
                 node.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
             }
-            if (directives.waFor && directives.waFor.value) {
+            if ((_e = directives.waFor) === null || _e === void 0 ? void 0 : _e.value) {
                 node.attributes['wx:for'] = getAttrBind(directives.waFor, `${wxmlDataPrefix.widgetProp}${id}${parentForNodes
                     .map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
                     .join('')}`);
@@ -159,7 +161,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 node.attributes['wx:key'] = 'id';
             }
             const compSchema = componentProto.dataForm;
-            for (const prop in data) {
+            for (const prop of Object.keys(data)) {
                 if (compSchema) {
                     const fieldDef = compSchema[prop];
                     if (!fieldDef && !isGlobalAttr(prop)) {
@@ -167,7 +169,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                         continue;
                     }
                     if (fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.readOnly) {
-                        if (fieldDef.hasOwnProperty('default')) {
+                        if (Object.prototype.hasOwnProperty.call(fieldDef, 'default')) {
                             node.attributes[prop] = fieldDef.default;
                         }
                         else {
@@ -180,7 +182,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                         const passedComp = data[prop].value;
                         const [libName, compName] = passedComp.split(':');
                         const { tagName, path } = (0, materials_1.getWxmlTag)({ moduleName: libName, name: compName }, ctx, nameMangler);
-                        node.attributes['generic:' + getGenericCompTagName(prop)] = tagName;
+                        node.attributes[`generic:${getGenericCompTagName(prop)}`] = tagName;
                         usingComponents[tagName] = path;
                         continue;
                     }
@@ -213,7 +215,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.isDataContainer) {
                 node.attributes['bind:onDataChange'] = getMpEventHanlderName(id, 'onDataChange');
             }
-            if (compConfig && compConfig.pluginConfig) {
+            if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.pluginConfig) {
                 if (compConfig.pluginConfig.attributes) {
                     Object.assign(node.attributes, compConfig.pluginConfig.attributes);
                 }
@@ -274,7 +276,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                     }
                 });
             }
-            nodeTransform && nodeTransform(widgets[id], node);
+            nodeTransform === null || nodeTransform === void 0 ? void 0 : nodeTransform(widgets[id], node);
             elements.push(node);
         }
         return elements.sort((a, b) => a._order - b._order);
@@ -292,7 +294,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
 exports.generateWxml = generateWxml;
 function xmlJsonSetCustomAttr(node, prop, value, comp) {
     if (mp_1.builtinWigetProps.indexOf(prop) > -1) {
-        console.error(error('Builtin prop(' + prop + ') is not allowed for custom component'), comp);
+        console.error(error(`Builtin prop(${prop}) is not allowed for custom component`), comp);
         return;
     }
     node.attributes[prop] = value;
@@ -302,7 +304,6 @@ function xmlJsonSetCustomAttr(node, prop, value, comp) {
     }
 }
 const evtNameMap = {
-    // eslint-disable-next-line @typescript-eslint/camelcase
     __weapps_action_trigger_click: 'tap',
 };
 function getMpEventName(originalName) {
@@ -366,7 +367,7 @@ function getAttrBind(dVale, widgetBind, isStaticResource) {
         : `{{${attrVal}}}`;
 }
 function getGenericCompTagName(propName) {
-    return 'g--' + propName;
+    return `g--${propName}`;
 }
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#list_of_global_attributes
 function isGlobalAttr(prop = '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -36,7 +36,7 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.3.28",
+    "@cloudbase/cals": "^0.3.29",
     "@cloudbase/lowcode-generator": "0.6.17-mpbeta.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

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

@@ -36,7 +36,10 @@ function createGlboalApi() {
     state: observable(state),
     computed: createComputed(computed),
     common,
-    ...mpApp
+    ...mpApp,
+    invoke(params) {
+      return globalAPI.__internal__.activePage.invokeComponentMethod(params)
+    },
     // ... other sdk apis & apis from mp
   } // The global api exposed to lowcode
 

package/template/mp/app.js

@@ -1,136 +1,121 @@
 import { setConfig, getAccessToken, initTcb } from './datasources/index'
 import lifeCycle from './lowcode/lifecycle'
 import { app } from './app/weapps-api'
-import WxReportV2 from './common/wx_yypt_report_v2'
 // 引入数据源管理器并进行初始化
 import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
 import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
 
 const $app = app;
-<% if (yyptConfig.yyptAppKey) { %>
-const wxReport = new WxReportV2({
-  appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
-  reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
-  autoReportPV: true, // 是否自动上报页面PV
-  // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
-  // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
-  getRemoteParamsUrl: '',
-  stopReport: <%= yyptConfig.stopReport %>, // 停止上报
-  intervalTime: 3, // 间隔多久执行一次上报，默认3秒
-  reportLogsNum: 5, // 每次合并上报记录条数，默认5次
-});
-
-  // 设置数据源请求的 loading 及 toast 处理
-  setConfig({
-    beforeDSRequest: (cfg) => {
-      if (!cfg.options || !cfg.options.showLoading) return
-      app.showLoading()
-    },
-    beforeCallFunction: async (params) => {
-      try {
-        const loginPage = findLoginPage();
+// 设置数据源请求的 loading 及 toast 处理
+setConfig({
+  beforeDSRequest: (cfg) => {
+    if (!cfg.options || !cfg.options.showLoading) return
+    app.showLoading()
+  },
+  beforeCallFunction: async (params) => {
+    try {
+      const loginPage = findLoginPage();
 
-        let skip = false;
-        switch (params?.data?.methodName) {
-          case 'callWedaApi': {
-            if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
-              skip = true;
-            }
-            break;
+      let skip = false;
+      switch (params?.data?.methodName) {
+        case 'callWedaApi': {
+          if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
+            skip = true;
           }
+          break;
         }
+      }
 
-        // 后续做过滤处理
-        if (!loginPage || (params?.data?.mode === 'c' && skip)) {
-          return params;
-        }
-        // await initTcb();
-        const { accessToken } = await getAccessToken();
-        if (accessToken) {
-          params.data.accessToken = accessToken;
-        }
-      } catch (e) {
-        if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+      // 后续做过滤处理
+      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+        return params;
+      }
+      // await initTcb();
+      const { accessToken } = await getAccessToken();
+      if (accessToken) {
+        params.data.accessToken = accessToken;
+      }
+    } catch (e) {
+      if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+        app.showToast({
+          title: '登录态失效',
+          icon: 'error',
+        });
+      }
+      console.error('beforeCallFunction error', e);
+    }
+    return params;
+  },
+  afterDSRequest: (cfg, error, result) => {
+    if (!cfg.options) return
+    if (cfg.options.showLoading) app.hideLoading()
+    if (!cfg.options.showToast) return
+    const isSuccess = !error && result && !result.code
+    app.showToast({ icon: isSuccess ? 'success' : 'error' })
+  },
+  async afterCallFunction(params, error, res) {
+    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+      const loginPage = findLoginPage();
+      if (loginPage) {
+        const authConfig = await getAuthConfig();
+        let isAnonymous = true;
+        try {
+          const { accessToken } = await getAccessToken();
+          isAnonymous = !accessToken;
+        } catch (e) { }
+        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
+          redirectToLogin();
+        } else if (authConfig.RejectStrategy == 'show_warning') {
           app.showToast({
-            title: '登录态失效',
+            title: '接口无访问权限',
             icon: 'error',
           });
         }
-        console.error('beforeCallFunction error', e);
-      }
-      return params;
-    },
-    afterDSRequest: (cfg, error, result) => {
-      if (!cfg.options) return
-      if (cfg.options.showLoading) app.hideLoading()
-      if (!cfg.options.showToast) return
-      const isSuccess = !error && result && !result.code
-      app.showToast({ icon: isSuccess ? 'success' : 'error' })
-    },
-    async afterCallFunction(params, error, res) {
-      if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
-        const loginPage = findLoginPage();
-        if (loginPage) {
-          const authConfig = await getAuthConfig();
-          let isAnonymous = true;
-          try {
-            const { accessToken } = await getAccessToken();
-            isAnonymous = !accessToken;
-          } catch (e) { }
-          if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
-            redirectToLogin();
-          } else if (authConfig.RejectStrategy == 'show_warning') {
-            app.showToast({
-              title: '接口无访问权限',
-              icon: 'error',
-            });
-          }
-        }
       }
     }
-  })
+  }
+})
 
-    <% }%>
-      App({
-        onLaunch(options) {
-          this.app = app
-          const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
-          let { query = {} } = options
-          EXTRA_API.setParams('$global', query)
-          createStateDataSourceVar('$global', generateParamsParser({ app }))
+App({
+  onLaunch(options) {
+    this.app = app
+    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
+    let { query = {} } = options
+    EXTRA_API.setParams('$global', query)
+    createStateDataSourceVar('$global', generateParamsParser({ app }))
 
-          onLaunch && onLaunch.call(this, options)
-            <% if (yyptConfig.yyptAppKey) { %>
-              // 挂运营平台上报对象到app里
-              app.yyptReport = wxReport
-                <% }%>
+    onLaunch && onLaunch.call(this, options)
+      <% if (yyptConfig.yyptAppKey) { %>
+        // 挂运营平台上报对象到app里
+        app.yyptReport = wxReport
+          <% }%>
 
-                  // 初始私有全局数据
-                  this.$$global = {
-            homePageId: '<%= appConfig.homePageId %>'
-          }
-        },
-        onShow(options) {
-          const fn = lifeCycle.onShow || lifeCycle.onAppShow
-          fn && fn.call(this, options)
-            <% if (yyptConfig.yyptAppKey) { %>
-              wxReport.startReport()
-              <% }%>
+            // 初始私有全局数据
+            this.$$global = {
+      homePageId: '<%= appConfig.homePageId %>'
+    }
+  },
+  onShow(options) {
+    const fn = lifeCycle.onShow || lifeCycle.onAppShow
+    fn && fn.call(this, options)
+      <% if (yyptConfig.yyptAppKey) { %>
+        wxReport.startReport()
+        <% }%>
+},
+  onHide() {
+    const fn = lifeCycle.onHide || lifeCycle.onAppHide
+    fn && fn.call(this)
+  },
+  onError(msg) {
+    const fn = lifeCycle.onError || lifeCycle.onAppError
+    fn && fn.call(this, msg)
+  },
+  onPageNotFound() {
+    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
+    fn && fn.call(this)
+  },
+  onUnhandledRejection() {
+    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
+    fn && fn.call(this)
   },
-        onHide() {
-          const fn = lifeCycle.onHide || lifeCycle.onAppHide
-          fn && fn.call(this)
-        },
-        onError(msg) {
-          const fn = lifeCycle.onError || lifeCycle.onAppError
-          fn && fn.call(this, msg)
-        },
-        onPageNotFound() {
-          const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
-          fn && fn.call(this)
-        },
-        onUnhandledRejection() {
-          const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
-          fn && fn.call(this)
-        },
-      })
+})

package/template/mp/common/util.js

@@ -2,6 +2,7 @@
 import { findForItemsOfWidget, getWidget } from './widget'
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
+import { getAccessToken } from '../datasources/index'
 
 /**
  * Convert abcWordSnd -> abc-word-snd
@@ -312,8 +313,11 @@ export async function checkAuth(app, appId, $page) {
   const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  const { accessToken } = await getAccessToken()
-  const isAnonymousUser = !accessToken
+  let isAnonymousUser = true;
+  try {
+    const { accessToken } = await getAccessToken();
+    isAnonymousUser = !accessToken;
+  } catch (e) { }
 
   if (!isAccess) {
     if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {

package/template/mp/common/weapp-component.js

@@ -4,6 +4,8 @@ import { createWidgets, getWidget, disposeWidget } from './widget'
 import mergeRenderer from './merge-renderer'
 import { runWatchers } from './watch'
 import sdk from './weapp-sdk'
+import lodashGet from 'lodash.get';
+
 
 /**
  * Lowcodes of all components
@@ -61,6 +63,19 @@ export function createComponent(key, behaviors, properties, events, handler, dat
 
         try {
           lifeCycle.onAttached && lifeCycle.onAttached.call($comp)
+          this.__handlerAttached__ = (e) => {
+            const widget = lodashGet(widgets, e.target.id);
+            widget._methods = e.detail.methods;
+          }
+          this.__handlerDetached__ = (e) => {
+            const widget = lodashGet(widgets, e.target.id);
+            delete widget._methods;
+          }
+          if ($comp.methods) {
+            this.triggerEvent('attached', {
+              'methods': $comp.methods
+            })
+          }
         } catch (e) {
           console.error('Component lifecycle(attached) error', this.is, e)
         }
@@ -82,6 +97,9 @@ export function createComponent(key, behaviors, properties, events, handler, dat
         disposeWidget(this._virtualRootWidget)
         this._disposers.forEach(dispose => dispose())
         lifeCycle.onDetached && lifeCycle.onDetached.call($comp)
+        if ($comp?.methods) {
+          this.triggerEvent('detached');
+        }
       }
     },
 

package/template/mp/common/weapp-page.js

@@ -4,6 +4,7 @@ import { createWidgets, createInitData, disposeWidget } from './widget';
 import mergeRenderer from './merge-renderer';
 import { createDataset, EXTRA_API, createStateDataSourceVar, generateParamsParser, setConfig } from '../datasources/index';
 import { runWatchers } from './watch'
+import lodashGet from 'lodash.get';
 
 export function createPage(
   id,
@@ -48,6 +49,28 @@ export function createPage(
       attached() {
         const $page = this.getWeAppInst()
         this._pageActive = true;
+        this.__handlerAttached__ = (e) => {
+          if (!$page.componentMethods) {
+            $page.componentMethods = {};
+          }
+          const [id, index = 0] = e.target.id.split('-');
+          if (!$page.componentMethods[id]) {
+            $page.componentMethods[id] = [];
+          }
+          $page.componentMethods[id][index] = e.detail.methods;
+        };
+        this.__handlerDetached__ = (e) => {
+          const [id, index = 0] = e.target.id.split('-');
+          if ($page.componentMethods) {
+            const components = $page.componentMethods[id];
+            if (components) {
+              components[index] = undefined;
+              if (components.filter(com => com !== undefined).length === 0) {
+                delete $page.componentMethods[id];
+              }
+            }
+          }
+        }
         this._disposers = this.initMergeRenderer($page.widgets);
       },
       detached() {
@@ -148,6 +171,27 @@ export function createPage(
         const { rootWidget } = createWidgets(widgetProps, dataBinds, $page.widgets, context, this)
         $page._rootWidget = rootWidget
 
+        $page.invokeComponentMethod = ({ component, method, params }) => {
+          const components = lodashGet($page.componentMethods, component);
+          let componentInstance = undefined
+          if (Array.isArray(components)) {
+            if(components.length > 1){
+              throw new Error('调用方法失败：id为'+component+'的组件拥有多个实例')
+            }
+            componentInstance = components[0]
+            // components.forEach(component => {
+            //   component[method](params);
+            // })
+          } else {
+            componentInstance = components
+          }
+
+          if(!componentInstance?.[method] || typeof componentInstance[method]!= 'function') {
+            throw new Error('调用方法失败：未找到id为'+component+'下的方法'+method)
+          }
+          return componentInstance[method](params);
+        };
+
         return $page
       },
     },

package/template/mp/common/widget.js

@@ -392,4 +392,5 @@ function mountBuiltinWigetsAPI(widget, owner) {
     })
   }
 
+  widget._methods = {}
 }

package/template/mp/datasources/index.js

@@ -1,4 +1,4 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth} from '@cloudbase/weda-client'
 const {
   setConfig,
   initTcb,
@@ -9,8 +9,8 @@ const {
   EXTRA_API,
   DS_API,
   DS_SDK,
-  getAccessToken,
 } = WEDA_CLOUD_SDK
+const getAccessToken = auth.getAccessToken
 
 export {
   createDataset,

package/template/mp/package.json

@@ -3,7 +3,8 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "0.1.13-alpha.1",
+		"@cloudbase/weda-client": "0.2.1",
+    "@cloudbase/oauth": "0.1.1-alpha.2",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",
 		"lodash.set": "^4.3.2",
@@ -13,4 +14,4 @@
 		})
 		%>
 	}
-}
+}