@cloudbase/framework-plugin-low-code 0.7.10-beta.2 → 0.7.11

package/template/src/handlers/lifecycle.js

@@ -2,7 +2,7 @@
 /**
  * 生命周期处理函数
  */
-import * as throttle from 'lodash/throttle';
+import { throttle } from 'lodash';
 import { wx } from '@tcwd/weapps-sdk';
 import * as querystring from 'querystring';
 // 小程序 端使用lifeCycle
@@ -33,7 +33,7 @@ export function initLifeCycle(
     onTabItemTap,
   },
   app,
-  mainApp
+  mainApp,
 ) {
   if (!process.env.isMiniprogram) {
     window.$$global = window.$$global || {};
@@ -61,17 +61,14 @@ export function initLifeCycle(
     mainApp.onAppHide && mainApp.onAppHide(onAppHide);
     mainApp.onError && mainApp.onError(onAppError);
     mainApp.onPageNotFound && mainApp.onPageNotFound(onAppPageNotFound);
-    mainApp.onUnhandledRejection &&
-      mainApp.onUnhandledRejection(onAppUnhandledRejection);
+    mainApp.onUnhandledRejection && mainApp.onUnhandledRejection(onAppUnhandledRejection);
 
     // 预留等客户端来触发
     window.addEventListener('appLaunch', (...args) => onAppLaunchCb(...args));
     window.addEventListener('appShow', (...args) => onAppShow(...args));
     window.addEventListener('appHide', (...args) => onAppHide(...args));
     window.addEventListener('error', (...args) => onAppError(...args));
-    window.addEventListener('unhandledRejection', (...args) =>
-      onAppUnhandledRejection(...args)
-    );
+    window.addEventListener('unhandledRejection', (...args) => onAppUnhandledRejection(...args));
     window.$$global.alreadyInitAppLifeCycle = true;
   }
 
@@ -84,9 +81,7 @@ export function initLifeCycle(
     window.addEventListener('wxunload', (...args) => onPageUnload(...args));
     // 页面级别特殊事件
     if (typeof onPullDownRefresh === 'function') {
-      window.addEventListener('pulldownrefresh', (...args) =>
-        onPullDownRefresh(...args)
-      );
+      window.addEventListener('pulldownrefresh', (...args) => onPullDownRefresh(...args));
     }
 
     if (typeof onPageScroll === 'function') {
@@ -143,7 +138,7 @@ export function pageLifeCycleMount(
     onShareTimeline,
     onTabItemTap,
   },
-  app = {}
+  app = {},
 ) {
   let queryText = location.href.split('?')[1];
   let query = querystring.parse(queryText);
@@ -162,22 +157,16 @@ export function pageLifeCycleMount(
     if (typeof onPullDownRefresh === 'function') {
       app.onPullDownRefresh(onPullDownRefresh);
     }
-    if (
-      typeof onPageScroll === 'function' ||
-      typeof onReachBottom === 'function'
-    ) {
+    if (typeof onPageScroll === 'function' || typeof onReachBottom === 'function') {
       window.onscroll = throttle(() => {
         //变量scrollTop是滚动条滚动时，滚动条上端距离顶部的距离
-        let scrollTop =
-          document.documentElement.scrollTop || document.body.scrollTop;
+        let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
 
         //变量windowHeight是可视区的高度
-        let windowHeight =
-          document.documentElement.clientHeight || document.body.clientHeight;
+        let windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
 
         //变量scrollHeight是滚动条的总高度（当前可滚动的页面的总高度）
-        let scrollHeight =
-          document.documentElement.scrollHeight || document.body.scrollHeight;
+        let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
         if (typeof onPageScroll === 'function') {
           onPageScroll({
             scrollTop: window.pageYOffset,

package/template/src/handlers/render.jsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as _ from 'lodash';
+import { set, cloneDeep } from 'lodash';
 import { ForContext, getComponentRenderList } from './FieldMiddleware/renderer';
 import { isScopeSlot } from '../utils/index';
 import { observer } from 'mobx-react-lite';
@@ -9,9 +9,7 @@ export function getComponentChildren(component, context = {}) {
   if (!properties) {
     return [];
   }
-  const list = Object.values(properties).sort(
-    (a, b) => (a['x-index'] || 0) - (b['x-index'] || 0)
-  );
+  const list = Object.values(properties).sort((a, b) => (a['x-index'] || 0) - (b['x-index'] || 0));
   const {
     virtualFields,
     codeContext,
@@ -81,9 +79,7 @@ function getRenderList(props) {
     //   preClassName.current = className;
     // }
 
-    containerEl['x-props'].classNameList = Array.from(
-      new Set([className, ...classNameList])
-    );
+    containerEl['x-props'].classNameList = Array.from(new Set([className, ...classNameList]));
   }
 
   if (xProps && xProps.sourceKey) {
@@ -117,14 +113,7 @@ function getRenderList(props) {
 export function generateSlotMetaMap(componentSchema, context, options = {}) {
   const slots = {};
   const { properties = {} } = componentSchema;
-  const {
-    scopeContext,
-    codeContext,
-    virtualFields,
-    dataContext,
-    updateContext,
-    forContext,
-  } = context;
+  const { scopeContext, codeContext, virtualFields, dataContext, updateContext, forContext } = context;
   // eslint-disable-next-line guard-for-in
   for (const key in properties) {
     const child = properties[key];
@@ -135,8 +124,8 @@ export function generateSlotMetaMap(componentSchema, context, options = {}) {
         type: isHOC ? 'HOC' : 'ELEMENT',
         node: isHOC
           ? (props) => {
-              let clonedScopeContext = _.cloneDeep(scopeContext);
-              _.set(clonedScopeContext, `${componentSchema.key}.${key}`, props);
+              let clonedScopeContext = cloneDeep(scopeContext);
+              set(clonedScopeContext, `${componentSchema.key}.${key}`, props);
               return (
                 <AppRender
                   key={key}

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

@@ -1,10 +1,6 @@
 import config from '../../datasources/config'
-import { getTcbInstance, getAccessToken } from '@cloudbase/weda-cloud-sdk/dist/h5';
-
-async function loginScope() {
-  const { auth } = await getTcbInstance();
-  return auth.loginScope();
-}
+import { auth } from '@cloudbase/weda-client';
+const { loginScope, getAccessToken } = auth;
 
 export function getComponentId(key) {
   return `__weapps-component-wrapper-${key}`;
@@ -218,44 +214,29 @@ export async function checkAnonymous() {
   return isAnonymous;
 }
 
-let loginConfig;
-export async function getLoginConfig() {
-  if (loginConfig !== undefined) {
-    return loginConfig;
-  }
-  const { staticResourceDomain, id } = app.__internal__.getConfig();
-  const url = `https://${staticResourceDomain}/${id}/login.config.json?t=${Date.now()}`;
-  try {
-    let response = await fetch(url);
-    loginConfig = await response.json();
-  } catch (e) {
-    loginConfig = {};
-    console.error(`加载登录配置${url}失败`, e);
-  }
-  return loginConfig;
-}
-
 /**
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
-    app.showNavigationBarLoading();
-  const loginConfig = await getLoginConfig();
+  const loginPage = findLoginPage(app);
+  if (loginPage?.id === $page.id) {
+    return true
+  }
+  app.showNavigationBarLoading();
   const requestList = [getAccessPermission(app, appId, $page.id)];
-  // 登录配置内有web登录项则认为开启web登录
-  if (loginConfig.web?.length > 0) {
+  // 暂时先认为有登录页则自定义登录功能开启且生效
+  if (loginPage) {
     requestList.push(getAuthConfig(app));
     requestList.push(checkAnonymous());
-    requestList.push(getLoginConfig()); // 提前并行加载
   }
   const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (loginConfig.web?.length > 0 && isAnonymous) {
+  if (loginPage && isAnonymous) {
     if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
-      return false;
+      return isAccess;
     }
   }
 
@@ -268,22 +249,25 @@ export async function checkAuth(app, appId, $page) {
   return isAccess;
 }
 
-export async function redirectToLogin(currentPage) {
+export function redirectToLogin(currentPage) {
   // 去登录则清空权限缓存。
   _AUTH_CACHE_MAP = {};
   const app = window.app;
-
-  const loginConfig = await getLoginConfig();
-  if (loginConfig.web?.length > 0) {
-    const { staticResourceDomain, envId, id, clientId } = app.__internal__.getConfig();
-    const url = `${location.origin}/__auth/?redirect_uri=${encodeURIComponent(
-      location.href,
-    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}`;
+  const loginPage = findLoginPage(app);
+  if (!currentPage) {
+    currentPage = app.utils.getCurrentPage() || {};
+  }
+  if (loginPage?.id === currentPage.id) {
+    return true
+  }
+  if (loginPage) {
     app.redirectTo({
-      mode: 'web',
-      params: {},
-      url,
-    });
+      pageId: loginPage.id,
+      params: {
+        sourcePageId: currentPage.id,
+        sourcePageParams: currentPage.dataset.params
+      }
+    })
   } else {
     app.showToast({
       title: '用户未登录',

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

@@ -58,12 +58,7 @@ export function getDom(element, options) {
   return Promise.resolve(result);
 }
 
-export function findWidgets(
-  widget,
-  parentType,
-  filterFn,
-  includeInvisibleDescendants
-) {
+export function findWidgets(widget, parentType, filterFn, includeInvisibleDescendants) {
   if (!widget) return [];
 
   let { children = [] } = widget;
@@ -94,12 +89,7 @@ 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;
@@ -114,14 +104,7 @@ export function createWidgets(
    * @param {*} context
    * @returns top level widgets or for dispose
    */
-  function runFor(
-    curForNode,
-    forItems,
-    parentLevelWidgets,
-    parentWidget,
-    scopeContext,
-    context
-  ) {
+  function runFor(curForNode, forItems, parentLevelWidgets, parentWidget, scopeContext, context) {
     const nodeId = curForNode.id;
     if (!curForNode.value) {
       return createSubTree(curForNode, {}, scopeContext, context);
@@ -148,8 +131,7 @@ export function createWidgets(
         dfsTree(curForNode, (node) => {
           const arr = parentLevelWidgets[node.id];
           arr.splice(0, arr.length);
-          parentWidget &&
-            remove(parentWidget.children, ({ id }) => id === node.id);
+          parentWidget && remove(parentWidget.children, ({ id }) => id === node.id);
         });
 
         forList.forEach((item, index) => {
@@ -180,10 +162,7 @@ export function createWidgets(
           w.findWidgets = (type, includeInvisibleDescendants) =>
             findWidgets(w, w.widgetType, type, includeInvisibleDescendants);
           w.getWidgetsByType = (type, includeInvisibleDescendants) =>
-            w.findWidgets(
-              (currentWidget) => currentWidget.widgetType === type,
-              includeInvisibleDescendants
-            );
+            w.findWidgets((currentWidget) => currentWidget.widgetType === type, includeInvisibleDescendants);
           w.getOwnerWidget = () => null; // 寻找父widget，默认返回null， 后续会覆写
           w._getInstanceRef = () => null; // 默认初始值
           Object.defineProperty(w, '_methods', {
@@ -221,12 +200,7 @@ export function createWidgets(
               const dispose = autorun(() => {
                 try {
                   // Computed data bind in the next tick since data bind may read widgets data
-                  w[prop] = dataBinds[node.id][prop](
-                    subForItems,
-                    undefined,
-                    context,
-                    scopeContext
-                  );
+                  w[prop] = dataBinds[node.id][prop](subForItems, undefined, context, scopeContext);
                   disposeError = false;
                 } catch (e) {
                   options.showLog && console.error(e);
@@ -252,10 +226,7 @@ export function createWidgets(
 
       // run for of next level
       dfsTree(curForNode, (node, parentNode) => {
-        if (
-          node.forCount === curForNode.forCount + 1 &&
-          dataBinds[node.id]?._waFor
-        ) {
+        if (node.forCount === curForNode.forCount + 1 && dataBinds[node.id]?._waFor) {
           widgets[node.id]._disposers = { dataBinds: [] };
           const dispose = runFor(
             node,
@@ -263,7 +234,7 @@ export function createWidgets(
             widgets,
             node.parent && widgets[node.parent.id],
             scopeContext,
-            context
+            context,
           );
           curForNode.id && widgets[curForNode.id]._disposers.push(dispose);
         }

package/template/src/index.jsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
-import { setConfig, getAccessToken, initTcb } from '@cloudbase/weda-cloud-sdk/dist/h5'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth } from '@cloudbase/weda-client'
 import App from './router'
 import './utils/monitor-jssdk.min'
 import './index.less'
@@ -11,21 +11,22 @@ import '@babel/polyfill/noConflict'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, getAuthConfig, checkAnonymous, getLoginConfig } 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);
 }
 
 // 设置数据源请求的 loading 及 toast 处理
-setConfig({
+WEDA_CLOUD_SDK.setConfig({
   beforeDSRequest: (cfg) => {
     if (!cfg.options || !cfg.options.showLoading) return
     app.showLoading()
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginConfig = await getLoginConfig();
+      const loginPage = findLoginPage();
+
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -37,10 +38,10 @@ setConfig({
       }
 
       // 后续做过滤处理
-      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
+      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
-      const { accessToken } = await getAccessToken();
+      const { accessToken } = await auth.getAccessToken();
       if (accessToken) {
         params.data.accessToken = accessToken;
       }
@@ -58,8 +59,8 @@ setConfig({
   },
   async afterCallFunction(params, error, res) {
     if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginConfig = await getLoginConfig();
-      if (loginConfig.web?.length > 0) {
+      const loginPage = findLoginPage();
+      if (loginPage) {
         const authConfig = await getAuthConfig();
         const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {

package/template/src/pages/app.tpl

@@ -86,6 +86,7 @@ export default function App() {
   const isPure = !!pureSrc;
 
   React.useEffect(() => {
+
     Object.assign($page, {
       id: '<%= pageName %>',
       state: observable(initPageState),
@@ -102,6 +103,7 @@ export default function App() {
         app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
       });
     };
+    app.__internal__.activePage = $page
 
     checkAuth(app, app.id, $page).then((checkAuthResult) => {
       setWeDaHasLogin(checkAuthResult)

package/template/src/utils/formatEnum.js

@@ -30,7 +30,7 @@ function getEnumOptions(optionName) {
   }
   return '';
 }
-export async function getGeneralOptions(optionName) {
+async function getGeneralOptions(optionName) {
   return app.cloud.callWedaApi({
     action: 'DescribeGeneralOptionsDetailList',
     data: {

package/template/src/utils/index.js

@@ -12,20 +12,6 @@ export function createComputed(funcs, bindContext = null) {
   return obj;
 }
 
-/*
-根据 object对象的path路径获取值。 如果解析 value 是 undefined 会以 defaultValue 取代。
-*/
-export function getter(context, path, defaultValue = undefined) {
-  return lodashGet(context, path, defaultValue);
-}
-
-/*
-设置 object对象中对应 path 属性路径上的值，如果path不存在，则创建。 缺少的索引属性会创建为数组，而缺少的属性会创建为对象。 使用_.setWith 定制path创建
-*/
-export function setter(context, path, value = undefined) {
-  return lodashSet(context, path, value);
-}
-
 export function checkVisible({ _visible }) {
   return _visible !== false && _visible !== '';
 }