@cloudbase/lowcode-builder 1.8.106 → 1.8.108

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

@@ -1,13 +1,7 @@
-import { auth, getWedaAPI } from '@cloudbase/weda-client'
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from '../common/util';
-import { setConfig, initTcb } from '../common/cloud-sdk';
-
-const getAccessToken = auth.getAccessToken
-const loginScope = auth.loginScope
-
+import { auth, getWedaAPI, app as clientApp } from '@cloudbase/weda-client'
 import { default as config, AEGIS_CONFIG } from './config'
 
-setConfig({
+clientApp.init({
   ...config,
   // 设置数据源请求的 loading 及 toast 处理
   beforeDSRequest: (cfg) => {
@@ -15,42 +9,6 @@ setConfig({
     if (!cfg.options || !cfg.options.showLoading) return;
     app.showLoading();
   },
-  beforeCallFunction: async (params) => {
-    const { app } = getWedaAPI();
-    try {
-      const loginPage = findLoginPage();
-
-      let skip = false;
-      switch (params?.data?.methodName) {
-        case 'callWedaApi': {
-          if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
-            skip = true;
-          }
-          break;
-        }
-      }
-
-      // 后续做过滤处理
-      const endpointType = app?.__internal__?.getCloudSdkConfig('endpointType');
-      if ((params?.data?.mode === 'c' && skip) || (endpointType !== 'tcb-api' && !loginPage)) {
-        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) => {
     const { app } = getWedaAPI();
     if (!cfg.options) return;
@@ -59,61 +17,7 @@ setConfig({
     const isSuccess = !error && result && !result.code;
     app.showToast({ icon: isSuccess ? 'success' : 'error' });
   },
-  async afterCallFunction(params, error, res) {
-    const { app } = getWedaAPI();
-    let oauthError =
-      error?.message?.includes?.('PERMISSION_DENIED') ||
-      error?.code === 'unauthenticated' ||
-      error?.error === 'unauthenticated' ||
-      error?.code === 'invalid_grant' ||
-      error?.error === 'invalid_grant' ||
-      error?.code === 'INVALID_ACCESS_TOKEN';
-
-    if (!oauthError) {
-      try {
-        /**
-         * js-sdk v2 实现上吞了所有错误
-         * 返回 new Error(JSON.stringify({code: "OPERATION_FAIL", msg:"[INVALID_ACCESS_TOKEN]XXX"}))
-         */
-        let tcbErrorObj = JSON.parse(error.message);
-        if (tcbErrorObj?.code === 'OPERATION_FAIL' && /\[INVALID_ACCESS_TOKEN\]/.test(tcbErrorObj.msg)) {
-          oauthError = true;
-        }
-      } catch (e) {}
-    }
-
-    if (
-      params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' &&
-      (['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code) || oauthError)
-    ) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
-        const authConfig = await getAuthConfig();
-        if (authConfig.RejectStrategy === 'to_login') {
-          if (['InnerError.AuthFailure'].includes(res?.result?.code)) {
-            const isAnonymous = await checkAnonymous();
-            if (!isAnonymous) return;
-            // 匿名用户越权去登录
-          }
-          redirectToLogin();
-        } else if (authConfig.RejectStrategy === 'show_warning') {
-          if (oauthError) {
-            const isAnonymous = await checkAnonymous();
-            if (!isAnonymous) {
-              redirectToLogin();
-              return;
-            }
-          }
-          app.showToast({
-            title: '接口无访问权限',
-            icon: 'error',
-          });
-        }
-      }
-    }
-  },
-});
-initTcb()
+})
 
 <% if(cdnEndpoints.aegis){ %>
 require.async('../packages/$wd_system/index.js').then(({ Aegis }) => {

package/template/mp/package.json

@@ -1,19 +1,8 @@
 {
   "name": "lcap-<%= appId%>",
   "version": "1.0.8",
-  "scripts": {},
-  "dependencies": {<% if(importJSSDK) {%>
-		"@cloudbase/js-sdk": "2.5.45-beta.0",<%
-    } %>
-		"@cloudbase/oauth": "0.1.1-alpha.11",
-    "@cloudbase/weda-client": "1.0.34",
-    "@cloudbase/weda-cloud-sdk": "1.0.63",
-    "mobx": "^5.15.4",
-    "lodash.get": "^4.4.2",
-    "lodash.set": "^4.3.2",
-    "miniprogram-gesture": "^1.0.6",
-    "miniprogram-api-promise": "^1.0.4"<% Object.keys(extraDeps).map(depName => {%>,
-      "<%= depName%>": "<%= extraDeps[depName]%>"<%
-    })%>
-  }
+  "scripts": {
+    "fix:cloud": "node -e 'try{const fix = require(\"@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js\");fix()}catch(e){}'"
+  },
+  "dependencies": <%= JSON.stringify(extraDeps, undefined, 2) %>
 }

package/template/mp/packages/$wd_system/pages/login/index.json

@@ -3,7 +3,7 @@
     "login-input": "./components/input/index",
     "gsd-h5-react-Modal": "../../../../materials/gsd-h5-react/components/modal/index",
     "gsd-h5-react-RichTextView": "../../../../materials/gsd-h5-react/components/richText/index",
-    "wd-ph": "../../../../common/placeholder/index",
+    "wd-ph": "@cloudbase/weda-client/mp/runtime/placeholder/index",
     "wd-info": "../../../../common/info/index",
     "captcha-dialog": "./components/captchaDialog/index"
   },

package/template/mp/packages/$wd_system/pages/login/methods/loginByWXPhone.js

@@ -9,7 +9,9 @@ export default async function (instance, { event }) {
     const endpointType = app.__internal__ && app.__internal__.getCloudSdkConfig && app.__internal__.getCloudSdkConfig('endpointType');
     const isTcbApi = endpointType === 'tcb-api';
     const phoneCode = event.detail.code
-    const providerInfo = {};
+    const providerInfo = {
+      provider_params: { provider_code_type: "phone" }
+    };
     wx.showLoading()
     if (isTcbApi) {
       const { code } = await wx.login();
@@ -27,7 +29,7 @@ export default async function (instance, { event }) {
       if (!token) {
         throw new Error('请在控制台检查小程序相关配置');
       }
-      providerInfo.provider_id = 'weda';
+      providerInfo.provider_id = providerId;
       providerInfo.provider_access_token = `${
         app.utils._getConfig
           ? app.utils._getConfig().envId
@@ -44,7 +46,8 @@ export default async function (instance, { event }) {
         provider_token: providerToken.provider_token,
         provider_id: providerId,
         provider_params: {
-          code: phoneCode
+          code: phoneCode,
+          provider_code_type: "phone"
         },
       })
     }

package/template/mp/page/index.js

@@ -1,6 +1,5 @@
-import { observable } from 'mobx';
 import { createPage, PAGE_ROOT_SYMBOL } from '<%= subLevelPath %>../../common/weapp-page'
-import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
+import { concatClassList, px2rpx } from '@cloudbase/weda-client'
 import { app, $app } from '<%= subLevelPath %>../../app/weapps-api'
 import { <%= pageNameVar %> as handlers } from '../../app/handlers'
 <%= importor.lifecycle? `import lifecycle from '../../lowcode/${pageName}/lifecycle'` : "const lifecycle = {}" %>

package/template/mp/common/constant.js

@@ -1 +0,0 @@
-export const REPEATER = <%= REPEATER %>

package/template/mp/common/data-patch-test.js

@@ -1,60 +0,0 @@
-import assert from 'assert'
-import { getDatapatch } from './data-patch.js'
-
-const cases = [
-    {
-        desc: 'New component',
-        base: {},
-        data: { id1: { a: 1 } },
-        patch: { id1: { a: 1 } }
-    }, {
-        desc: 'Component prop update',
-        base: { id1: { a: 1, b: 2 } },
-        data: { id1: { a: 1, b: 3 } },
-        patch: { 'id1.b': 3 }
-    }, {
-        desc: 'More than 1/3 of props changed',
-        base: { id1: { a: 1, b: 2, c: 3 } },
-        data: { id1: { a: 1, b: 4, c: 5 } },
-        patch: { id1: { a: 1, b: 4, c: 5 } }
-    }, {
-        desc: 'New multiple components',
-        base: {},
-        data: { id1: { a: 1 }, id2: { c: 2 }, id3: [{ c: 1 }] },
-        patch: { id1: { a: 1 }, id2: { c: 2 }, id3: [{ c: 1 }] }
-    },
-    {
-        desc: 'Update component prop in array',
-        base: { id1: [{ a: 1 }, { a: 2 }, { a: 8 }] },
-        data: { id1: [{ a: 1 }, { a: 3 }, { a: 8 }] },
-        patch: { 'id1[1].a': 3 }
-    },
-    {
-        desc: 'Update component prop in 2d array',
-        base: { id1: [[{ a: 1 }, { a: 2 }], [{ a: 1 }]] },
-        data: { id1: [[{ a: 1 }, { a: 3 }], [{ a: 1 }]] },
-        patch: { 'id1[0][1].a': 3 }
-    },
-    {
-        desc: 'Add component in array',
-        base: { id1: [{ a: 1 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }, { a: 9 }] },
-        patch: { 'id1[2]': { a: 9 } }
-    },
-    {
-        desc: 'Add 2 components in array',
-        base: { id1: [{ a: 1 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }, { a: 9 }, { a: 8 }] },
-        patch: { 'id1[2]': { a: 9 }, 'id1[3]': { a: 8 } }
-    },
-    {
-        desc: 'array: delete component',
-        base: { id1: [{ a: 1 }, { a: 2 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }] },
-        patch: { id1: [{ a: 1 }, { a: 2 }] }
-    }
-]
-
-for (const c of cases) {
-    assert.deepStrictEqual(getDatapatch(c.base, c.data), c.patch, c.desc)
-}

package/template/mp/common/data-patch.js

@@ -1,66 +0,0 @@
-import { deepEqual } from "./util"
-
-export function getDatapatch(base, pendingData) {
-  const patch = {}
-  for (const widgetId in pendingData) {
-    const baseWidget = base[widgetId]
-    const pendingWidget = pendingData[widgetId]
-    if (!baseWidget || typeof pendingWidget === 'string') {
-      patch[widgetId] = pendingWidget
-    } else {
-      patchProp(baseWidget, pendingWidget, patch, widgetId)
-    }
-  }
-  return patch
-}
-
-function patchProp(baseWidget, pendingWidget, patch, prefixes) {
-  if (Array.isArray(pendingWidget)) {
-    /**
-     * 数组长度发生变化，更新整个数组
-     * 当启用 _WaForKey，且可以取到key时，更新整个数组
-     * 通过 array[0].xxx 进行更新，id 不会更新，疑似 mp 实现 bug
-     */
-    if (pendingWidget.length != baseWidget.length) {
-      patch[prefixes] = pendingWidget
-    } else if (pendingWidget?.some(item=>item._waForKey) && pendingWidget[0]?._key) {
-      patch[prefixes] = pendingWidget
-    } else {
-      for (let i = 0; i < pendingWidget.length; i++) {
-        if (!baseWidget[i]) {
-          patch[prefixes + '[' + i + ']'] = pendingWidget[i]
-        } else {
-          patchProp(baseWidget[i], pendingWidget[i], patch, prefixes + '[' + i + ']')
-        }
-      }
-    }
-  } else {
-    if (pendingWidget._waIf === false && baseWidget._waIf === false) {
-      return
-    }
-    const propSet = new Set([...Object.keys(pendingWidget), ...Object.keys(baseWidget)])
-    // 额外剔除公共数据
-    propSet.delete('_parentId');
-    const allProps = Array.from(propSet);
-    // Attention: can not set xxx value to undefined with setData
-    let hasUndefined = false;
-    const differentProps = allProps.filter(prop => {
-      if(pendingWidget[prop] === undefined) {
-        hasUndefined = true;
-      }
-      // container 组件上的属性依赖自身的数据，例如 container.style 依赖 container.data，deepequal 防止死循环
-      if (prop === 'data' && typeof pendingWidget[prop] === 'object' && deepEqual(pendingWidget[prop], baseWidget[prop])) {
-        return false
-      }
-      // Attention: since setData will copy data deeply, if property is object, it should be treated as different
-      return typeof pendingWidget[prop] === 'object' || pendingWidget[prop] !== baseWidget[prop]
-    })
-    if (differentProps.length === 1 || differentProps.length <= allProps.length / 3) {
-      differentProps.map(patchProp => {
-        patch[prefixes + '.' + patchProp] = pendingWidget[patchProp]
-      })
-    } else {
-      patch[prefixes] = pendingWidget
-    }
-  }
-}

package/template/mp/common/event-emitter.js

@@ -1,124 +0,0 @@
-function checkFunc(listener) {
-  if (!listener instanceof Function) {
-    throw new Error(' The listener argument must be of type Function. ');
-  }
-}
-
-export default class EventEmitter {
-  constructor() {
-    this.listeners = {};
-  }
-
-  on(eventName, listener) {
-    checkFunc(listener);
-    let listeners = this.listeners[eventName];
-    if (!listeners) {
-      this.listeners[eventName] = [listener];
-    } else {
-      listeners.push(listener);
-    }
-  }
-
-  off(eventName, listener) {
-    let listeners = this.listeners[eventName];
-    if (listeners && listeners.length) {
-      const index = listeners.indexOf(listener);
-      index > -1 && listeners.splice(index, 1);
-    }
-  }
-
-  emit(eventName, ...args) {
-    let listeners = this.listeners[eventName] || [];
-    listeners.forEach((fn) => {
-      try {
-        fn.call(this, ...args);
-      } catch (err) {
-        console.error(err);
-      }
-    });
-  }
-
-  clear() {
-    this.listeners = {};
-  }
-}
-
-// interface IEventProps {
-//   type: string;
-//   currentTarget: any;
-//   target?: any;
-//   detail?: any;
-//   _isCapturePhase?: boolean;
-//   origin?: Event;
-// }
-
-export class Event {
-  type /* : string*/;
-  detail /* : any*/;
-  /**
-   * 类别应当为 typeof UserWidget
-   * 当前类别为 typeof $page.widgets.xxxx
-   * 添加上报确定用量
-   */
-  currentTarget /* : any */ /* typeof UserWidget */;
-  target /* ?: any */ /* typeof UserWidget */;
-  /**
-   * 内部实现
-   * 外部不应该进行访问
-   */
-  _isCapturePhase; /* : boolean; */
-  origin /* : Event */;
-  originEvent /* ?: React.SyntheticEvent */;
-  constructor(
-    {
-      type = '',
-      detail = undefined,
-      currentTarget = undefined,
-      target = undefined,
-      _isCapturePhase = false,
-      origin,
-      originEvent = undefined,
-    } /* : IEventProps*/,
-  ) {
-    function proxyWrapper(target, key) {
-      try {
-        return new Proxy(target, {
-          get(target, p) {
-            if (p !== 'id') {
-              // reportEvent(`event.${key}.${String(p)}`);
-            }
-            return target[p];
-          },
-        });
-      } catch (e) {
-        return target;
-      }
-    }
-    this.type = type;
-    this.detail = detail;
-    this.currentTarget = proxyWrapper(currentTarget, 'currentTarget');
-    this.target = proxyWrapper(target, 'target');
-    this.origin = proxyWrapper(origin, 'origin');
-    this.originEvent = originEvent;
-
-    this._isCapturePhase = _isCapturePhase;
-    return new Proxy(this, {
-      get(target, prop) {
-        switch (prop) {
-          case 'name': {
-            console.warn('[deprecated] event.name 将在未来版本放弃支持，请使用 event.type 替代');
-            return target.type;
-          }
-          case 'origin':
-          case 'target':
-          case 'currentTarget': {
-            return target[prop];
-            break;
-          }
-        }
-
-        return target[prop];
-      },
-    });
-  }
-}

package/template/mp/common/flow.js

@@ -1,65 +0,0 @@
-import { createEventHandlers, getMpEventHandlerName } from './util';
-import { Event } from './event-emitter';
-export class EventFlow {
-  #eventHandlerMap = {};
-  #context = {}
-  constructor({ schema, context, options }) {
-    this.#eventHandlerMap = {};
-    this.#context = context;
-    const { id, description, eventHandlers = {} } = schema || {};
-    this.id = id || '';
-    this.description = description || '';
-    this.#eventHandlerMap = Object.entries(
-      createEventHandlers(eventHandlers, {
-        looseError: true,
-        isComposite: options?.isComposite || false,
-        syncCall: true,
-      }),
-    ).reduce(
-      (map, [key, fn]) => {
-        map[key] = fn;
-        return map;
-      },
-      {
-        _getInstance: () => this.#context.$page || this.#context.$app,
-      },
-    );
-    return this;
-  }
-  trigger(additionalScope, options = {}) {
-    const mergedContext = {
-      ...this.#context,
-      ...options,
-    };
-    const { target } = mergedContext;
-    const eventName = `${this.id}.start`;
-    return this.#eventHandlerMap[getMpEventHandlerName(this.id, eventName)](
-      new Event({
-        type: eventName,
-        detail: additionalScope,
-        target,
-        currentTarget: target,
-      }),
-    );
-    // const emit = (trigger, eventData, originEvent?) =>
-    //   generateEmit($w, target)(
-    //     trigger,
-    //     this._listenerInstances,
-    //     eventData,
-    //     forContext,
-    //     originEvent,
-    //     scopeContext,
-    //     dataContext,
-    //     $w.page.id,
-    //     true,
-    //   );
-    // return emit(`${this.id}.start`, additionalScope);
-  }
-}
-export function generateEventFlows(flows = [], context, options) {
-  const result = {};
-  for (let flow of flows) {
-    result[flow.id] = new EventFlow({ schema: flow, context, options });
-  }
-  return result;
-}

package/template/mp/common/merge-renderer.js

@@ -1,75 +0,0 @@
-import { autorun } from 'mobx'
-import { touchObj, throttle } from './util'
-import { resolveWidgetData } from './widget'
-import { getDatapatch } from './data-patch'
-
-export default {
-  // Attention, must be called at the end of attached or page load to make sure user init take effect
-  initMergeRenderer(widgets, dataFactory = {}) {
-    this.flushPendingData = throttle(this.flushPendingData.bind(this), 18)
-
-    for (const id in widgets) {
-      const props = widgets[id]
-      dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props, id)
-    }
-    const disposers = []
-    for (const k in dataFactory) {
-      const disposer = autorun(r => {
-        this.requestRender({ [k]: dataFactory[k]() })
-      })
-      disposers.push(disposer)
-    }
-    this.flushPendingData() // Prepare data for first paint
-    return disposers
-  },
-
-  // setData merging
-  pendingData: null,
-  _settingData: false,  // flag to prevent multiple setData at the same time
-  _flushId: null,
-  flushPendingData() {
-    if (!this.pendingData || this._settingData) { return }
-    const patch = getDatapatch(this.data, this.pendingData)
-    this.pendingData = null
-    const label = `setData ${this.is} ${this.id}(${Object.keys(patch).join(',')})`
-
-    if (Object.keys(patch).length < 1) {
-      return
-    }
-    this._settingData = true
-    const lastUpdateTime = Date.now()
-    this._flushId = lastUpdateTime;
-    /**
-     * 兜底逻辑，当长时间 setData 没有返回时
-     * 直接抛弃，扭转 pending 状态
-     */
-    setTimeout(()=>{
-      if(this._flushId === lastUpdateTime && this._settingData) {
-        this._settingData = false;
-        this.flushPendingData()
-      }
-    }, 100)
-    this.setData(patch, () => {<% if(debug) {%>
-      const elapsedTime = Date.now() - lastUpdateTime;
-      if(elapsedTime > 16) {
-        console.warn(label, elapsedTime)
-      }else {
-        console.info(label, elapsedTime)
-      }<%} %>
-      this._settingData = false;
-      this.flushPendingData()
-    })
-  },
-  requestRender(data) {
-    if(!this._pageActive) {
-      // The callback of wx.chooseLocation occured when page is inactive
-      console.warn(`Attention, you're updating widgets(${Object.keys(data).join(',')}) of inactive page(${this.is})`)
-    }
-    if (!this.pendingData) {
-      this.pendingData = {}
-    }
-    wx.nextTick(this.flushPendingData)
-    touchObj(data)  // Touch all props to monitor data deeply, FIXME
-    Object.assign(this.pendingData, data)
-  },
-}

package/template/mp/common/placeholder/index.js

@@ -1 +0,0 @@
-Component({})

package/template/mp/common/placeholder/index.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

package/template/mp/common/placeholder/index.wxml

@@ -1 +0,0 @@
-<block></block>

package/template/mp/common/placeholder/index.wxss

@@ -1 +0,0 @@
-/* common/placeholder/index.wxss */