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

package/template/mp/datasources/index.js

@@ -1,8 +1,17 @@
-import {
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth} from '@cloudbase/weda-client'
+const {
   setConfig,
   initTcb,
-  CLOUD_SDK
-} from '@cloudbase/weda-cloud-sdk'
+  CLOUD_SDK,
+  createDataset,
+  createStateDataSourceVar,
+  generateParamsParser,
+  EXTRA_API,
+  DS_API,
+  DS_SDK,
+} = WEDA_CLOUD_SDK
+const getAccessToken = auth.getAccessToken
+
 export {
   createDataset,
   createStateDataSourceVar,
@@ -11,8 +20,10 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-  setConfig
-} from '@cloudbase/weda-cloud-sdk'
+  setConfig,
+  getAccessToken,
+  initTcb,
+}
 
 import config from './config'
 

package/template/mp/package.json

@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "scripts": {},
   "dependencies": {
-    "@cloudbase/weda-cloud-sdk": "1.0.8",
-    "@cloudbase/oauth": "0.1.1-alpha.2",
+    "@cloudbase/weda-client": "0.2.8",
+    "@cloudbase/oauth": "0.1.1-alpha.5",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.10",
+    "@cloudbase/weda-client": "0.2.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

@@ -1,15 +1,18 @@
 import * as sdk from '@tcwd/weapps-sdk';
+import {
+  createWebApp,
+  _ACTIONS_KEY as ACTIONS_KEY,
+  _ROUTER_KEY as ROUTER_KEY,
+} from '@cloudbase/weda-client';
 import { createComputed } from 'utils';
-import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '../datasources';
+import { createDataset } from '../datasources';
 import store, { subPackageName } from '../store';
 import computed from '../store/computed';
 import common from './common';
-import { formatDate } from '../utils/date';
 import { formatEnum, enumOptions } from '../utils/formatEnum';
-import { getter, setter, _isMobile } from '../utils';
+import { _isMobile } from '../utils';
 import actionMap from './material-actions';
-import { scanCodeApi } from '../utils/scan-code-action';
-import { get as lodashGet } from 'lodash'
+import { get as lodashGet } from 'lodash';
 
 const mainAppKey = '__weappsMainApp';
 const appGlobal = process.env.isMiniprogram ? getApp() : window;
@@ -17,98 +20,46 @@ const appGlobal = process.env.isMiniprogram ? getApp() : window;
 export const app = createGlboalApi();
 export const $page = createPageApi();
 
-export function setCurrentPage(pageCtx) {
-  try {
-    app.__internal__.activePage = pageCtx
-  } catch(e) { }
-  Object.assign($page, pageCtx);
-}
-
 function createGlboalApi() {
+  const webApp = createWebApp({
+    id: '<%= appId %>',
+    domain: '<%= domain %>',
+    appConfig: <%= appConfig %>,
+  });
   const globalAPI = {
     id: '<%= appId %>',
     domain: '<%= domain %>',
-    platform: 'WEB',
-    __internal__: {
-      activePage: null,
-      getConfig: function () {
-        return <%= appConfig %>;
-      },
-      resolveStaticResourceUrl(staticUrl) {
-        if (/^\//.test(staticUrl) && !window._isPrivate) {
-          const domain = globalAPI?.__internal__?.getConfig?.()?.staticResourceDomain || globalAPI?.domain || ''
-          const url = `https://${domain}${staticUrl}`;
-          return url;
-        }
-        return staticUrl;
-      }
-    },
     formActions: {},
     pages: {},
     session: {
-      configure: sdk.configure,
-      request: sdk.request,
-      getSessionId: sdk.getSessionId,
+      // configure: sdk.configure,
+      // request: sdk.request,
+      // getSessionId: sdk.getSessionId,
     },
-    enumOptions: enumOptions,
     state: store,
     computed: createComputed(computed.global),
     common,
-    dataSources: DS_SDK,
-    relaunchHome: function () {
-      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,
-      /**
-       * @deprecated
-       */
-      _getConfig(){
-        return globalAPI.__internal__.getConfig()
-      },
-      getWXContext: function () {
-        return Promise.resolve({})
-      },
-      getCurrentPage: function () {
-        return $page
-      },
+      return $page.invokeComponentMethod(params);
     },
+    ...webApp,
+  };
 
-    // ... other sdk apis & apis from mp
-  }; // The global api exposed to lowcode
+  globalAPI.__internal__.enumOptions = enumOptions;
+  globalAPI.utils.formatEnum = formatEnum;
+  globalAPI.utils._getConfig = () => {
+    console.warn('deprecated app.utils._getConfig');
+    return globalAPI.__internal__.getConfig();
+  }
 
   const dataset = createDataset('$global');
   globalAPI.dataset = dataset;
   globalAPI.state.dataset = dataset;
   globalAPI.setState = (userSetState) => {
     Object.keys(userSetState).forEach((keyPath) => {
-      globalAPI.utils.set(
-        globalAPI.dataset.state,
-        keyPath,
-        userSetState[keyPath]
-      );
+      globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
-  /**
-   * 内部通用的设置状态变量值的方法
-   *  varPath 结构为 $global.<变量名> 即全局变量
-   *                $page.<变量名>  即当前页面变量
-   *                <pageId>.<变量名> 指定页面 pageId 的变量 (应当避免修改非当前页面的变量值)
-   */
-  globalAPI._setStateVal = (config) => {
-    EXTRA_API.setState(config.varPath, config.val);
-  };
   if (subPackageName) {
     // is sub app
     globalAPI.mainApp = appGlobal[mainAppKey];
@@ -126,9 +77,6 @@ function createGlboalApi() {
   sdkModsIncluded.forEach((key) => {
     globalAPI[key] = sdk[key];
   });
-  // 避免被wx.cloud 覆盖
-  globalAPI.cloud = CLOUD_SDK;
-
   return globalAPI;
 }
 function createPageApi() {
@@ -144,7 +92,7 @@ function createPageApi() {
   $page.invokeComponentMethod = ({ component, method, params }) => {
     const widgetData = lodashGet($page.widgets, component);
     if (Array.isArray(widgetData)) {
-      throw new Error('调用方法失败：id为'+component+'的组件拥有多个实例')
+      throw new Error('调用方法失败：id为' + component + '的组件拥有多个实例');
       // widgetData.forEach(widget => {
       //   if(!widget._methods[method]) {
       //     throw new Error('NOT_FOUND')
@@ -153,12 +101,12 @@ function createPageApi() {
       //   }
       // })
     } else {
-      if(!widgetData._methods[method] || typeof widgetData._methods[method]!= 'function') {
-        throw new Error('调用方法失败：未找到id为'+component+'下的方法'+method)
+      if (!widgetData._methods[method] || typeof widgetData._methods[method] != 'function') {
+        throw new Error('调用方法失败：未找到id为' + component + '下的方法' + method);
       }
-      return widgetData._methods[method](params)
+      return widgetData._methods[method](params);
     }
-  }
+  };
   return $page;
 }
 
@@ -166,80 +114,19 @@ function createPageApi() {
 export const mountAPIs = (sdks) => {
   Object.keys(sdks).forEach((item) => {
     let action = sdks[item];
-
-    switch (item) {
-      case 'showToast': {
-        action = function (obj) {
-          if (obj.icon === 'error' && !obj.image) {
-            return sdks[item]({
-              ...obj,
-              image:
-                'data:image/svg+xml,%3Csvg%20width%3D%22120%22%20height%3D%22120%22%20viewBox%3D%220,0,24,24%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2010.586l5.657-5.657%201.414%201.414L13.414%2012l5.657%205.657-1.414%201.414L12%2013.414l-5.657%205.657-1.414-1.414L10.586%2012%204.929%206.343%206.343%204.93%2012%2010.586z%22%20fill-rule%3D%22evenodd%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E',
-            });
-          }
-          return sdks[item](obj);
-        };
-        break;
-      }
-      case 'showModal': {
-        const OFFICIAL_COMPONENT_LIB = 'gsd-h5-react';
-        const showModal =
-          actionMap[OFFICIAL_COMPONENT_LIB] &&
-          actionMap[OFFICIAL_COMPONENT_LIB].showModal;
-        if (!_isMobile() && showModal) {
-          action = function (params) {
-            return showModal({ data: params });
-          };
-        }
-        break;
-      }
-      case 'scanCode': {
-        action = (options) => {
-          if (
-            !options ||
-            (!options.success && !options.fail && !options.complete)
-          ) {
-            return new Promise((resolve, reject) => {
-              scanCodeApi({
-                ...options,
-                success: resolve,
-                fail: reject,
-              });
-            });
-          }
-          scanCodeApi(options);
-        };
-        break;
-      }
-      case 'navigateTo':
-      case 'reLaunch':
-      case 'redirectTo': {
-        action = function (obj) {
-          if (obj.mode === 'web' && process.env.isMiniprogram) {
-            console.warn('url navigation can only be used in h5 build');
-            return;
-          }
-          const { url, ...restOpts } = obj;
-          if (obj.mode === 'web') {
-            if (item === 'navigateTo') {
-              window.open(url);
-            } else {
-              window.location.href = url;
-            }
-          } else {
-            return sdks[item]({
-              ...restOpts,
-              pageId: restOpts.pageId
-                ? restOpts.pageId.replace(/^(\.)?\//, '')
-                : restOpts.pageId,
-            });
-          }
+    if(item === 'showModal') {
+      const OFFICIAL_COMPONENT_LIB = 'gsd-h5-react';
+      const showModal = actionMap[OFFICIAL_COMPONENT_LIB]?.showModal;
+      if (!_isMobile() && showModal) {
+        action = function (params) {
+          return showModal({ data: params });
         };
-        break;
       }
+      app[item] = action;
+    }
+    else if (!(item in ACTIONS_KEY) && !(item in ROUTER_KEY)) {
+      app[item] = action;
     }
-
-    app[item] = action;
   });
   return app;
 };

package/template/src/datasources/index.js.tpl

@@ -1,6 +1,18 @@
-import { setConfig, initTcb } from '@cloudbase/weda-cloud-sdk/dist/h5';
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 import config from './config';
 
+const {
+  setConfig,
+  initTcb,
+  createDataset,
+  createStateDataSourceVar,
+  generateParamsParser,
+  EXTRA_API,
+  CLOUD_SDK,
+  DS_API,
+  DS_SDK
+} = WEDA_CLOUD_SDK
+
 export {
   createDataset,
   createStateDataSourceVar,
@@ -9,7 +21,7 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-} from '@cloudbase/weda-cloud-sdk/dist/h5';
+}
 
 setConfig(config);
 <% if(!isXPage){ %>

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

@@ -25,7 +25,7 @@ function generateSlotMap(slots, forContext = undefined) {
           slotProp,
           <ForContext.Provider value={forContext}>
             <Element />
-          </ForContext.Provider>
+          </ForContext.Provider>,
         );
       } else {
         set(map, slotProp, <Element />);
@@ -49,14 +49,7 @@ function getSafeComponentProps({ style, classNameList }) {
 }
 
 // TODO: 需要不断移除 dataBinds(style/classList)
-function getBindData({
-  widgetData,
-  forItems,
-  scopeContext,
-  codeContext,
-  commonStyle = {},
-  classNameList = [],
-}) {
+function getBindData({ widgetData, forItems, scopeContext, codeContext, commonStyle = {}, classNameList = [] }) {
   // bindData
   if (Array.isArray(widgetData)) {
     widgetData =
@@ -103,19 +96,13 @@ function getBindData({
 
   // bindClassList
   const bindClassList = fieldData.classList || [];
-  const finalClassNameList = getFinalClassNameList(
-    classNameList,
-    bindClassList
-  );
+  const finalClassNameList = getFinalClassNameList(classNameList, bindClassList);
 
   // 当前在复合组件中，且当前节点为根节点
   if (isInComposite && isRootNode) {
     if (widgetData.ownerWidget) {
       Object.keys(widgetData.ownerWidget).forEach((propName) => {
-        if (
-          propName === 'role' ||
-          ['aria-', 'data-'].some((prefix) => propName.startsWith(prefix))
-        ) {
+        if (propName === 'role' || ['aria-', 'data-'].some((prefix) => propName.startsWith(prefix))) {
           widgetData[propName] = widgetData.ownerWidget[propName];
         }
       });
@@ -142,10 +129,7 @@ function getForList(compId, dataBinds, parentForItems, dataContext) {
 
   try {
     // 绑定了 for 变量，但计算值错误时，应当空数组兜底
-    forList =
-      dataBinds &&
-      dataBinds._waFor &&
-      (dataBinds._waFor(parentForItems, undefined, dataContext) || []);
+    forList = dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems, undefined, dataContext) || []);
   } catch (e) {
     // 计算值出错则使用空数组兜底
     forList = [];
@@ -176,14 +160,7 @@ function FieldWrapper({
   children,
   updateContext,
 }) {
-  const {
-    scopeContext,
-    forContext,
-    forIndexes,
-    widgetsData,
-    codeContext,
-    dataContext,
-  } = context;
+  const { scopeContext, forContext, forIndexes, widgetsData, codeContext, dataContext } = context;
 
   const injectContext = {};
   const indexRef = React.useRef();
@@ -210,14 +187,7 @@ function FieldWrapper({
       }
 
       if (injectContext?.emit) {
-        return injectContext.emit(
-          trigger,
-          listeners,
-          eventData,
-          forItems,
-          domEvent,
-          scopeContext
-        );
+        return injectContext.emit(trigger, listeners, eventData, forItems, domEvent, scopeContext);
       } else {
         const event = {
           detail: eventData,
@@ -240,16 +210,14 @@ function FieldWrapper({
             domEvent,
           },
           scopeContext,
-          dataContext
+          dataContext,
         );
       }
     },
-    [widgetsData]
+    [widgetsData],
   );
 
-  const currentWidget = Array.isArray(widgetsData)
-    ? get(widgetsData, forIndexes)
-    : widgetsData;
+  const currentWidget = Array.isArray(widgetsData) ? get(widgetsData, forIndexes) : widgetsData;
 
   React.useLayoutEffect(() => {
     return () => {
@@ -266,10 +234,7 @@ function FieldWrapper({
   }
 
   // 判断为容器组件，则增加一个onDataChange事件
-  if (
-    componentSchema?.compConfig?.isDataContainer &&
-    !events?.includes('onDataChange')
-  ) {
+  if (componentSchema?.compConfig?.isDataContainer && !events?.includes('onDataChange')) {
     events.push('onDataChange');
   }
 
@@ -285,34 +250,23 @@ function FieldWrapper({
               typeRef.current = blockKey;
             }
           },
-          events:
-            componentSchema?.selectableBlock?.events.map((item) => item.name) ||
-            [],
+          events: componentSchema?.selectableBlock?.events.map((item) => item.name) || [],
           emit: (trigger, evt, domEvent) =>
             emit(
               trigger,
               indexRef?.current !== undefined &&
                 typeRef?.current &&
-                data?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[
-                  'x-props'
-                ]?.listenerInstances,
+                data?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.['x-props']?.listenerInstances,
               evt,
               forContext,
               domEvent,
-              scopeContext
+              scopeContext,
             ),
         },
       }}
       id={id}
       emit={(trigger, eventData, domEvent) =>
-        emit(
-          trigger,
-          listenerInstances,
-          eventData,
-          forContext,
-          domEvent,
-          scopeContext
-        )
+        emit(trigger, listenerInstances, eventData, forContext, domEvent, scopeContext)
       }
       events={events}
       compositeParent={compositeParent}
@@ -361,9 +315,7 @@ export function getComponentRenderList(props) {
 
   const isInComposite = !!codeContext;
   // 判断 widgets 是从 page 来的，还是组件来的
-  const widgetsData = !isInComposite
-    ? $page.widgets[compId]
-    : codeContext.$WEAPPS_COMP.widgets[compId];
+  const widgetsData = !isInComposite ? $page.widgets[compId] : codeContext.$WEAPPS_COMP.widgets[compId];
 
   if (!xProps) {
     return (
@@ -386,9 +338,7 @@ export function getComponentRenderList(props) {
   if (forList) {
     return forList
       .map((item, index) => {
-        const forItemsIndexes = (parentForItems['forIndexes'] || []).concat(
-          index
-        );
+        const forItemsIndexes = (parentForItems['forIndexes'] || []).concat(index);
         const forItems = {
           ...parentForItems,
           [compId]: item,
@@ -421,8 +371,8 @@ export function getComponentRenderList(props) {
             },
             {
               renderSlot,
-            }
-          )
+            },
+          ),
         );
 
         return (
@@ -491,8 +441,8 @@ export function getComponentRenderList(props) {
       },
       {
         renderSlot,
-      }
-    )
+      },
+    ),
   );
 
   return (
@@ -527,13 +477,8 @@ export function getComponentRenderList(props) {
   );
 }
 
-export function getFinalStyle(
-  commonStyle = {},
-  bindStyle = {},
-  widgetStyle = {}
-) {
-  const remBindStyle =
-    typeof bindStyle === 'object' ? translateStyleToRem(bindStyle) : {};
+export function getFinalStyle(commonStyle = {}, bindStyle = {}, widgetStyle = {}) {
+  const remBindStyle = typeof bindStyle === 'object' ? translateStyleToRem(bindStyle) : {};
 
   return {
     ...(translateStyleToRem(commonStyle) || {}),
@@ -542,11 +487,7 @@ export function getFinalStyle(
   };
 }
 
-export function getFinalClassNameList(
-  classNameList = [],
-  bindClassList = [],
-  widgetClassList = []
-) {
+export function getFinalClassNameList(classNameList = [], bindClassList = [], widgetClassList = []) {
   return [].concat(classNameList, bindClassList, widgetClassList);
 }
 
@@ -577,8 +518,7 @@ function setGetDomApi(currentWidget, props) {
       currentWidget.domRef = React.createRef();
     }
     if (!currentWidget.getDom) {
-      currentWidget.getDom = (options) =>
-        getDom(currentWidget.domRef.current, options);
+      currentWidget.getDom = (options) => getDom(currentWidget.domRef.current, options);
     }
 
     if (

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

@@ -11,13 +11,7 @@ export function getMetaInfoBySourceKey(sourceKey) {
   };
 }
 
-export function emitEvent(
-  trigger,
-  listeners = [],
-  args,
-  scopeContext = {},
-  context
-) {
+export function emitEvent(trigger, listeners = [], args, scopeContext = {}, context) {
   const targetListeners = listeners.filter((l) => l.trigger === trigger);
   targetListeners.forEach(async (listener) => {
     // 当前非捕获Event，再判断冒泡行为
@@ -26,10 +20,7 @@ export function emitEvent(
     }
 
     // 判断捕获的执行，只有执行的捕获与配置的捕获一致时。才会执行。
-    if (
-      (listener?.isCapturePhase || false) ===
-      (args?.customEventData?.isCapturePhase || false)
-    ) {
+    if ((listener?.isCapturePhase || false) === (args?.customEventData?.isCapturePhase || false)) {
       try {
         const res = await invokeListener(listener, args, scopeContext, context);
         const eventName = `${listener.key}.success`;
@@ -58,11 +49,11 @@ export function emitEvent(
             customEventData: event,
           },
           scopeContext,
-          context
+          context,
         );
         if (res) {
           console.warn(
-            `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+            `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`,
           );
         }
       } catch (e) {
@@ -87,10 +78,10 @@ export function emitEvent(
             customEventData: event,
           },
           scopeContext,
-          context
+          context,
         );
         console.warn(
-          `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+          `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`,
         );
         // 之前 invoke 内部catch 了错误，不会抛错
         // throw e
@@ -99,12 +90,7 @@ export function emitEvent(
   });
 }
 
-async function invokeListener(
-  { instanceFunction, data = {}, dataBinds = {} },
-  args,
-  scopeContext,
-  context
-) {
+async function invokeListener({ instanceFunction, data = {}, dataBinds = {} }, args, scopeContext, context) {
   // ToDo resolve databinds
   const action = instanceFunction;
   let maxTimeout = DEFAULT_MAX_TIMEOUT;
@@ -119,21 +105,14 @@ async function invokeListener(
     { event: args.event },
     scopeContext,
     true,
-    context
+    context,
   );
 
   // eslint-disable-next-line no-restricted-syntax
   for (const key in resolvedDataBinds) {
-    if (
-      resolvedDataBinds[key] &&
-      resolvedDataBinds[key].__type === 'scopedValue'
-    ) {
+    if (resolvedDataBinds[key] && resolvedDataBinds[key].__type === 'scopedValue') {
       try {
-        lodashSet(
-          resolvedData,
-          key,
-          resolvedDataBinds[key].getValue(scopeContext)
-        );
+        lodashSet(resolvedData, key, resolvedDataBinds[key].getValue(scopeContext));
       } catch (e) {
         lodashSet(resolvedData, key, '');
       }