@cloudbase/framework-plugin-low-code 0.7.2-beta.1 → 0.7.2

package/lib/builder/core/generate.js

@@ -61,7 +61,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
             const tplStr = yield fs_extra_1.default.readFile(path_1.default.join(config_1.appTemplateDir, 'src/app/global-api.js'), {
                 encoding: 'utf8',
             });
-            const globalApiContent = (0, lodash_template_1.default)(tplStr)({
+            const globalApiContent = (0, lodash_template_1.default)(tplStr, { interpolate: /<%=([\s\S]+?)%>/g })({
                 appId: appKey,
                 subPackageName: rootPath,
                 domain: domain,
@@ -74,10 +74,10 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                         .sort((item) => (item.isHome ? -1 : 1))
                         .map((item) => {
                         var _a;
-                        return {
+                        return ({
                             id: item.id,
                             type: ((_a = item.data) === null || _a === void 0 ? void 0 : _a.isCustomLoginPage) ? 'login' : '',
-                        };
+                        });
                     }),
                 }),
             });

package/lib/builder/mp/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,uBAAuB,EAKxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,OAanD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE;;;EAa1E;AAGD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,UAsDnD;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,GAAG,EAAE,aAAa,MA4BnB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,aAAa,MAmGnB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,GAAG,EAAE,aAAa,MAuDnB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,uBAAuB,EAKxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,OAanD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE;;;EAa1E;AAGD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,UAsDnD;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,GAAG,EAAE,aAAa,MA4BnB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,aAAa,MAsGnB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,GAAG,EAAE,aAAa,MAuDnB"}

package/lib/builder/mp/util.js

@@ -153,7 +153,8 @@ function createEventHanlders(widgets, componentApi, ctx) {
             let handler = (_a = l.handler) === null || _a === void 0 ? void 0 : _a.name;
             switch (l.type) {
                 case weapps_core_1.ActionType.Platform: {
-                    handler = `function({data}){ return app.${(_b = l.handler) === null || _b === void 0 ? void 0 : _b.name}(data)}`;
+                    let method = (_b = l.handler) === null || _b === void 0 ? void 0 : _b.name;
+                    handler = `function({data}){ return app.${method}(data)}`;
                     break;
                 }
                 case weapps_core_1.ActionType.DataSource: {
@@ -176,7 +177,8 @@ function createEventHanlders(widgets, componentApi, ctx) {
         });
         if ((_c = compProto === null || compProto === void 0 ? void 0 : compProto.compConfig) === null || _c === void 0 ? void 0 : _c.isDataContainer) {
             const customName = (0, wxml_1.getMpEventHanlderName)(id, 'onDataChange', {});
-            eventHanlders[customName] = [{
+            eventHanlders[customName] = [
+                {
                     key: `wa${Date.now().toString().slice(-8)}`,
                     handler: `({event}) => {
           app.utils.set(context, '${id}.data', event?.detail?.data);
@@ -184,7 +186,8 @@ function createEventHanlders(widgets, componentApi, ctx) {
                     handlerModule: weapps_core_1.ActionType.Platform,
                     data: {},
                     boundData: {},
-                }];
+                },
+            ];
         }
     });
     return eventHanlders;

package/lib/builder/mp/wxml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UA4V7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}
+{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UA+V7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}

package/lib/builder/mp/wxml.js

@@ -141,6 +141,8 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
                 name: tagName,
                 attributes: {
                     id: idAttr,
+                    'bind:attached': '__handlerAttached__',
+                    'bind:detached': '__handlerDetached__',
                     style: `{{${attrPrefix}style}}`,
                     [(0, mp_1.getClassAttrName)(tagName)]: `{{${attrPrefix}className}}`,
                 },
@@ -194,8 +196,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
             listeners.forEach((l) => {
                 const evtName = getMpEventName(l.trigger);
                 const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] =
-                    getMpEventHanlderName(id, evtName, modifiers);
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
             });
             const compConfig = componentProto.compConfig;
             if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.isDataContainer) {

package/lib/builder/service/builder/generate.js

@@ -235,9 +235,9 @@ exports.pullComponentToListByInstance = pullComponentToListByInstance;
 function getVirtualFieldsString(components) {
     const fields = components.reduce((result, component) => {
         const { name, materialName, variableName, isPlainProps } = component;
-        result[`${materialName}:${name}`] = `%%%(props) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps
+        result[`${materialName}:${name}`] = `%%%React.forwardRef((props, ref) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps
             ? '{...resolveComponentProps(props, 1)}'
-            : '{...resolveComponentProps(props, 0)}'} pageVirtualFields={virtualFields}/>%%%`;
+            : '{...resolveComponentProps(props, 0)}'} ref={ref} pageVirtualFields={virtualFields}/>)%%%`;
         return result;
     }, {});
     return JSON.stringify(fields, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {

package/lib/utils/dataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../src/utils/dataSource.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AAMpE,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,aAAa,aAAa,CAAC;AAMxC,wBAAgB,yBAAyB,CAAC,UAAU,KAAA,EAAE,IAAI,KAAA,UAGzD;AAED,wBAAgB,4BAA4B,CAAC,KAAK,KAAA,EAAE,UAAU,KAAA,EAAE,IAAI,KAAA,UAGnE;AAMD,wBAAgB,yBAAyB,CAAC,QAAQ,KAAA,EAAE,IAAI,KAAA,iBAIvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,IAAI,OAAA,MAexC;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,GAAG,CAU1D;AAOD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,GAAG,OA6C5C;AAOD,wBAAgB,qBAAqB,CAAC,WAAW,KAAA,OAsBhD;AAOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;EAU7D;AAiCD,wBAAgB,kBAAkB,CAChC,WAAW,EAAE;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EACD,IAAI,CAAC,EAAE;IACL,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EAAE,MAgBJ"}
+{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../src/utils/dataSource.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AAMpE,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,aAAa,aAAa,CAAC;AAMxC,wBAAgB,yBAAyB,CAAC,UAAU,KAAA,EAAE,IAAI,KAAA,UAGzD;AAED,wBAAgB,4BAA4B,CAAC,KAAK,KAAA,EAAE,UAAU,KAAA,EAAE,IAAI,KAAA,UAGnE;AAMD,wBAAgB,yBAAyB,CAAC,QAAQ,KAAA,EAAE,IAAI,KAAA,iBAIvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,IAAI,OAAA,MAexC;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,GAAG,CAU1D;AAOD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,GAAG,OA6C5C;AAOD,wBAAgB,qBAAqB,CAAC,WAAW,KAAA,OAehD;AAOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;EAU7D;AAiCD,wBAAgB,kBAAkB,CAChC,WAAW,EAAE;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EACD,IAAI,CAAC,EAAE;IACL,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EAAE,MAiBJ"}

package/lib/utils/dataSource.js

@@ -108,13 +108,7 @@ function getDatasourceProfiles(datasources) {
             type: ds.type,
             childDataSourceNames: ds.childDataSourceNames,
             schema: ds.schema,
-            methods: ds.methods &&
-                ds.methods.map((method) => {
-                    return {
-                        name: method.name,
-                        type: method.type,
-                    };
-                }),
+            methods: ds.methods,
         };
     })) || []);
 }
@@ -168,8 +162,7 @@ function getDatasetProfiles(mainAppData, apps) {
         (_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((pageInstance) => {
             let p = pageInstance;
             if (p.dataset) {
-                result[app.rootPath ? `${app.rootPath}/${p.id}` : p.id] =
-                    _generateDynamicDataset(p.dataset);
+                result[app.rootPath ? `${app.rootPath}/${p.id}` : p.id] = _generateDynamicDataset(p.dataset);
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.2-beta.1",
+  "version": "0.7.2",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

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

@@ -55,6 +55,9 @@ function createGlboalApi() {
         });
       }
     },
+    invoke(params) {
+      return app.activePage.invokeComponentMethod(params)
+    },
     utils: {
       formatDate,
       formatEnum,

package/template/mp/common/util.js

@@ -312,8 +312,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

@@ -3,6 +3,7 @@ import { createEventHandlers, createComputed } from './util'
 import { createWidgets, mpCompToWidget, disposeWidget } from './widget'
 import mergeRenderer from './merge-renderer'
 import sdk from './weapp-sdk'
+import lodashGet from 'lodash.get';
 
 /**
  * Lowcodes of all components
@@ -48,7 +49,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       },
       attached() {
         const $comp = this.getWeAppInst()
-        if(!$comp) return
+        if (!$comp) return
 
         $comp.props.events = createPropEvents(events, this)
         $comp.widgets = {}
@@ -57,6 +58,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)
         }
@@ -69,29 +83,33 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       },
       detached() {
         const $comp = this.getWeAppInst()
-        if(!$comp) return
+        if (!$comp) return
 
         $comp.widgets = null
         disposeWidget(this._virtualRootWidget)
         this._disposers.forEach(dispose => dispose())
         lifeCycle.onDetached && lifeCycle.onDetached.call($comp)
+
+        if ($comp?.methods) {
+          this.triggerEvent('detached');
+        }
       }
     },
 
     pageLifetimes: {
       show() {
         const $comp = this.getWeAppInst()
-        if(!$comp) return
+        if (!$comp) return
         lifeCycle.onPageShow && lifeCycle.onPageShow.call($comp)
       },
       hide() {
         const $comp = this.getWeAppInst()
-        if(!$comp) return
+        if (!$comp) return
         lifeCycle.onPageHide && lifeCycle.onPageHide.call($comp)
       },
       resize(size) {
         const $comp = this.getWeAppInst()
-        if(!$comp) return
+        if (!$comp) return
         lifeCycle.onPageResize && lifeCycle.onPageResize.call($comp, size)
       }
     },
@@ -119,12 +137,12 @@ export function createComponent(key, behaviors, properties, events, handler, dat
         return widget.$comp
       },
       _runWatch() {
-        const { watchEffects = {}} = index
+        const { watchEffects = {} } = index
         Object.keys(watchEffects).map(name => {
           const fn = watchEffects[name]
           if (fn instanceof Function) {
             const $comp = this.getWeAppInst()
-            if(!$comp) return
+            if (!$comp) return
             this._disposers.push(autorun(fn.bind($comp)))
           } else {
             console.error(`WatchEffect(${name}) of ${key} is not a function.`)
@@ -155,6 +173,7 @@ export function create$comp(w) {
       get classList() { return w.classList },
     },
     lib,
+    methods: undefined,
     i18n: {
       ...sdk.i18n,
       t(key, data) {

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

@@ -3,6 +3,8 @@ import { createComputed, createEventHandlers, checkAuth } from './util';
 import { createWidgets, createInitData, disposeWidget } from './widget';
 import mergeRenderer from './merge-renderer';
 import { createDataset, EXTRA_API, createStateDataSourceVar, generateParamsParser, setConfig } from '../datasources/index';
+import lodashGet from 'lodash.get';
+
 
 export function createPage(
   lifecycle,
@@ -67,6 +69,28 @@ export function createPage(
         this._rootWidget = rootWidget;
         this._widgets = widgets;
         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(widgets);
       },
       detached() {
@@ -143,7 +167,26 @@ export function createPage(
               app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
             });
           };
+          $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);
+          };
           this.$WEAPPS_PAGE = $page;
         }
         return this.$WEAPPS_PAGE

package/template/mp/common/widget.js

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

package/template/mp/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {},
   "dependencies": {
-    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
+    "@cloudbase/weda-cloud-sdk": "1.0.8",
     "@cloudbase/oauth": "0.1.1-alpha.2",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",

package/template/package.json

@@ -5,8 +5,8 @@
     "build-web": "webpack --config ./webpack/webpack.web.prod.js"
   },
   "dependencies": {
-    "@cloudbase/js-sdk": "1.5.3-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
+    "@cloudbase/js-sdk": "2.4.0-alpha.0",
+    "@cloudbase/weda-cloud-sdk": "1.0.8",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",

package/template/src/app/global-api.js

@@ -9,6 +9,7 @@ import { formatEnum, enumOptions } from '../utils/formatEnum';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
+import { get as lodashGet } from 'lodash'
 
 const mainAppKey = '__weappsMainApp';
 const appGlobal = process.env.isMiniprogram ? getApp() : window;
@@ -54,6 +55,9 @@ function createGlboalApi() {
         });
       }
     },
+    invoke(params) {
+      return $page.invokeComponentMethod(params)
+    },
     utils: {
       formatDate,
       formatEnum,
@@ -129,6 +133,24 @@ function createPageApi() {
     // 页面数据源变量存储位置
     dataVar: {},
   };
+  $page.invokeComponentMethod = ({ component, method, params }) => {
+    const widgetData = lodashGet($page.widgets, component);
+    if (Array.isArray(widgetData)) {
+      throw new Error('调用方法失败：id为'+component+'的组件拥有多个实例')
+      // widgetData.forEach(widget => {
+      //   if(!widget._methods[method]) {
+      //     throw new Error('NOT_FOUND')
+      //   } else {
+      //     actions.push(widget._methods[method])
+      //   }
+      // })
+    } else {
+      if(!widgetData._methods[method] || typeof widgetData._methods[method]!= 'function') {
+        throw new Error('调用方法失败：未找到id为'+component+'下的方法'+method)
+      }
+      return widgetData._methods[method](params)
+    }
+  }
   return $page;
 }
 

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -188,6 +188,7 @@ function FieldWrapper({
   const injectContext = {};
   const indexRef = React.useRef();
   const typeRef = React.useRef();
+  const instanceRef = React.useRef();
   const { 'x-props': xProps } = componentSchema;
   let { staticResourceAttribute = [], listenerInstances = [] } = xProps;
 
@@ -250,6 +251,16 @@ function FieldWrapper({
     ? get(widgetsData, forIndexes)
     : widgetsData;
 
+  React.useLayoutEffect(() => {
+    return () => {
+      instanceRef.current = undefined;
+    };
+  }, []);
+
+  React.useLayoutEffect(() => {
+    currentWidget._getInstanceRef = () => instanceRef;
+  }, [currentWidget, instanceRef]);
+
   if (!Array.isArray(staticResourceAttribute)) {
     staticResourceAttribute = [];
   }
@@ -264,6 +275,7 @@ function FieldWrapper({
 
   return (
     <Field
+      ref={instanceRef}
       data={{
         ...data,
         _selectableBlockEvents: {

package/template/src/handlers/actionHandler/utils.js

@@ -39,11 +39,9 @@ export function emitEvent(
               ? {
                   /**
                    * @deprecated 历史bug
-                   * value,origin,isCapturePhase
+                   * value
                    */
                   value: res,
-                  origin: args.event,
-                  isCapturePhase: !!args.event?.isCapturePhase,
                   ...res,
                 }
               : res,

package/template/src/handlers/utils/widgets.js

@@ -94,7 +94,12 @@ export function retryDataBinds(tryTime = 10) {
     retryDataBinds(tryTime - 1);
   }, 0);
 }
-export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context = {}) {
+export function createWidgets(
+  widgetProps,
+  dataBinds,
+  scopeContext = {},
+  context = {}
+) {
   const nodeTree = createWidgetTree(widgetProps, dataBinds);
   const widgets = runFor(nodeTree, {}, null, null, scopeContext, context);
   return widgets;
@@ -115,7 +120,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
     parentLevelWidgets,
     parentWidget,
     scopeContext,
-    context,
+    context
   ) {
     const nodeId = curForNode.id;
     if (!curForNode.value) {
@@ -180,6 +185,13 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
               includeInvisibleDescendants
             );
           w.getOwnerWidget = () => null; // 寻找父widget，默认返回null， 后续会覆写
+          w._getInstanceRef = () => null; // 默认初始值
+          Object.defineProperty(w, '_methods', {
+            get() {
+              const instance = this._getInstanceRef();
+              return instance?.current?.methods;
+            },
+          });
           // 提供一个给 Node 挂载 API 的方式
           untracked(() => {
             w.extends = (name, fnOrData) =>
@@ -213,7 +225,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
                     subForItems,
                     undefined,
                     context,
-                    scopeContext,
+                    scopeContext
                   );
                   disposeError = false;
                 } catch (e) {
@@ -251,7 +263,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
             widgets,
             node.parent && widgets[node.parent.id],
             scopeContext,
-            context,
+            context
           );
           curForNode.id && widgets[curForNode.id]._disposers.push(dispose);
         }

package/template/src/pages/composite.tpl

@@ -51,7 +51,7 @@ class CompositeCompWrapper extends React.Component {
     this.compConfig = <%= JSON.stringify(compConfig, null, 2) %>
     this.virtualFields = Object.assign({}, props.pageVirtualFields || {}, {
     <% useComponents.forEach(compItem => {%>
-      "<%= compItem.key %>": <% if(compItem.isPlainProps) {%> (props) => <<%= compItem.var %> {...resolveComponentProps(props, 1)} /> <% } else {%>  (props) => <<%= compItem.var %>{...resolveComponentProps(props, 0)} />  <% }%>,
+      "<%= compItem.key %>": React.forwardRef((props,ref) => <<%= compItem.var %> {...resolveComponentProps(props,  <%= compItem.isPlainProps? 1:0 %>)} ref={ref}/>),
     <%}) %>
     });
     this.events = (<%= emitEvents %>).reduce((obj, trigger) => {
@@ -107,6 +107,7 @@ class CompositeCompWrapper extends React.Component {
   }
 
   createCompAPI(compThis) {
+    const { forwardRef, ...restProps } = compThis.props || {};
     compThis.$WEAPPS_COMP = {
       compConfig: compThis.compConfig,
       widgets: compThis.widgets,
@@ -114,7 +115,7 @@ class CompositeCompWrapper extends React.Component {
       handler: compThis.handler,
       lib: { const: constObj, tools: toolsObj },
       get props() {
-        return {...compThis.props, events: compThis.events, data: compThis.propsData }
+        return {...restProps, events: compThis.events, data: compThis.propsData }
       },
       get state() {
         return compThis.state
@@ -122,16 +123,32 @@ class CompositeCompWrapper extends React.Component {
       get computed() {
         return compThis.computed
       },
+      get _instanceRef() {
+        return forwardRef
+      },
+      get methods() {
+        return forwardRef.current?.methods
+      },
+      set methods(value) {
+        if(!forwardRef.current) {
+          forwardRef.current = {}
+        }
+        forwardRef.current.methods = value
+        return value
+      }
     };
   }
 
   componentDidMount() {
-    lifecycle.onAttached && lifecycle.onAttached.bind(this)()
-    lifecycle.onReady && lifecycle.onReady.bind(this)()
+    const onAttached = lifecycle.onAttached && lifecycle.onAttached.bind(this)
+    Promise.resolve(onAttached()).then(()=>{
+      lifecycle.onReady && lifecycle.onReady.bind(this)()
+    })
   }
 
   componentWillUnmount() {
     lifecycle.onDetached && lifecycle.onDetached.bind(this)()
+    this.$WEAPPS_COMP._instanceRef.current = undefined
   }
 
   render() {
@@ -148,6 +165,7 @@ class CompositeCompWrapper extends React.Component {
   }
 }
 
-export default observer((props) => (
-   <CompositeCompWrapper {...props}></CompositeCompWrapper>
-));
+export default observer((props, _ref) => (
+   <CompositeCompWrapper {...props} forwardRef={_ref}></CompositeCompWrapper>
+), { forwardRef: true });
+