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

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;
@@ -17,6 +18,9 @@ export const app = createGlboalApi();
 export const $page = createPageApi();
 
 export function setCurrentPage(pageCtx) {
+  try {
+    app.__internal__.activePage = pageCtx
+  } catch(e) { }
   Object.assign($page, pageCtx);
 }
 
@@ -25,6 +29,12 @@ function createGlboalApi() {
     id: '<%= appId %>',
     domain: '<%= domain %>',
     platform: 'WEB',
+    __internal__: {
+      activePage: null,
+      getConfig: function () {
+        return <%= appConfig %>;
+      },
+    },
     formActions: {},
     pages: {},
     session: {
@@ -38,20 +48,26 @@ function createGlboalApi() {
     common,
     dataSources: DS_SDK,
     relaunchHome: function () {
-      const { pages = [] } = globalAPI.utils._getConfig();
+      const { pages = [] } = globalAPI.__internal__.getConfig();
       if (pages[0]) {
         globalAPI.reLaunch({
           pageId: pages[0].id,
         });
       }
     },
+    invoke(params) {
+      return $page.invokeComponentMethod(params)
+    },
     utils: {
       formatDate,
       formatEnum,
       get: getter,
       set: setter,
-      _getConfig: function () {
-        return <%= appConfig %>;
+      /**
+       * @deprecated
+       */
+      _getConfig(){
+        return globalAPI.__internal__.getConfig()
       },
       getWXContext: function () {
         return Promise.resolve({})
@@ -117,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/common.js

@@ -150,7 +150,7 @@ export function getStaticResourceAttribute(staticUrl) {
 }
 
 export function findLoginPage(app = window.app) {
-  const { pages = [] } = app.utils._getConfig();
+  const { pages = [] } = app.__internal__.getConfig();
   return pages.find(item => item.type === 'login');
 }
 
@@ -209,6 +209,19 @@ async function getAccessPermission(app, appId, pageId) {
   return isAccess
 }
 
+export async function checkAnonymous() {
+  // 用户是否非匿名登录前端判断条件：有accessToken且scope不为anonymous
+  // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
+  let isAnonymous = true;
+  try {
+    const [scope, { accessToken }] = await Promise.all([loginScope(), getAccessToken()]);
+    if (accessToken && scope !== 'anonymous') {
+      isAnonymous = false;
+    }
+  } catch (e) { }
+  return isAnonymous;
+}
+
 /**
  * 检查页面权限
  **/
@@ -223,31 +236,24 @@ export async function checkAuth(app, appId, $page) {
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
     requestList.push(getAuthConfig(app));
+    requestList.push(checkAnonymous());
   }
-  const [isAccess, authConfig] = await Promise.all(requestList);
+  const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (!isAccess) {
-    if (loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
-      redirectToLogin($page);
-    } else {
-      app.showToast({
-        title: '页面无访问权限',
-        icon: 'error',
-      });
-    }
-  } else if (loginPage && authConfig.NeedLogin) {
-    // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
-    try {
-      const [scope, { accessToken }] = await Promise.all([loginScope(), getAccessToken()]);
-      if (!accessToken || scope === 'anonymous') {
-        redirectToLogin($page);
-      }
-    } catch (e) {
-      console.error('获取身份失败', e);
+  if (loginPage && isAnonymous) {
+    if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
+      return isAccess;
     }
   }
+
+  if (!isAccess) {
+    app.showToast({
+      title: '页面无访问权限',
+      icon: 'error',
+    });
+  }
   return isAccess;
 }
 

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/index.jsx

@@ -12,7 +12,7 @@ import attachFastClick from 'fastclick'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, findLoginPage, getAuthConfig } from './handlers/utils'
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -63,7 +63,8 @@ setConfig({
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        if (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login') {
+        const isAnonymous = await checkAnonymous();
+        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
           redirectToLogin();
         } else if (authConfig.RejectStrategy == 'show_warning') {
           app.showToast({

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 });
+