@cloudbase/lowcode-builder 1.8.74 → 1.8.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.74",
+  "version": "1.8.76",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -32,8 +32,9 @@
     "test:build": "ts-node ./__tests__/build.ts",
     "dev:web:serve": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development  webpack-dev-server --config ./webpack/web.config.js",
     "dev:web": "cross-env NODE_ENV=development  webpack --config ./webpack/web.config.js",
-    "build:web": "yarn run set:NODE_OPTIONS cross-env NODE_ENV=production  webpack --config ./webpack/web.config.js",
-    "build:template": "./scripts/buildTemplate.sh",
+    "build:web": "yarn build:template && yarn run set:NODE_OPTIONS cross-env NODE_ENV=production  webpack --config ./webpack/web.config.js",
+    "build:template": "node ./scripts/generateTemplate.js",
+    "dev:template": "npm run build:template --watch",
     "dev:debug": "tsc-watch --onSuccess 'npm run build-dev-web-and-push'",
     "build-dev-web-and-push": "npm run dev:web && clear && yalc publish --push",
     "release": "yarn npm whoami --publish && npm run build && yarn set version 1.22.19 && yarn config set version-tag-prefix '@cloudbase/lowcode-builder@' && yarn version --no-commit-hooks --message 'chore(builder): v%s' && yarn config set version-tag-prefix v && yarn set version 3.6.2 && yarn npm publish",
@@ -46,8 +47,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.63",
-    "@cloudbase/lowcode-generator": "^1.8.24",
+    "@cloudbase/cals": "^1.0.65",
+    "@cloudbase/lowcode-generator": "^1.8.25",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

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

@@ -1,6 +1,8 @@
 import { observable } from 'mobx'
 import { createMpApp } from '@cloudbase/weda-client';
-import { createComputed, formatEnum, enumOptions, generateDatasetQuery } from '<%= subLevelPath %>../common/util'
+import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
+import { generateDatasetQuery } from '<%= subLevelPath %>../common/query'
+
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
 
@@ -59,6 +61,22 @@ export const $w = new Proxy(
   },
 );
 
+globalThis.__wedaGlobal__ = new Proxy({
+  app,
+  $w
+}, {
+  get(_, prop) {
+    switch(prop) {
+      case 'app':
+      case '$app':
+        return app
+      case '$w':
+        return $w
+    }
+    return undefined
+  }
+})
+
 function createGlboalApi() {
   const mpApp = createMpApp({
     appConfig: {

package/template/mp/app.js

@@ -1,128 +1,11 @@
-<%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
-import { app, $app } from './app/weapps-api';
+<%= importor.lifecycle? `import lifeCycle from '${wedaRootRelativePath}lowcode/lifecycle'` : "const lifeCycle = {}" %>
+import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 // 引入数据源管理器并进行初始化
 import {
-  setConfig,
-  getAccessToken,
   EXTRA_API,
   createStateDataSourceVar,
   generateParamsParser,
-} from './datasources/index';
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util';
-
-// 防止报类型不匹配warning
-const originWarn = console.warn;
-const warningSkipRegexp = /(type-uncompatible)|(slot "[\w-]*?" is not found)/;
-console.warn = (...args) => {
-  // 只看第一条
-  const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
-  if (!shouldSkip) {
-    originWarn(...args);
-  }
-};
-
-// 设置数据源请求的 loading 及 toast 处理
-setConfig({
-  beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return;
-    app.showLoading();
-  },
-  beforeCallFunction: async (params) => {
-    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) => {
-    if (!cfg.options) return;
-    if (cfg.options.showLoading) app.hideLoading();
-    if (!cfg.options.showToast) return;
-    const isSuccess = !error && result && !result.code;
-    app.showToast({ icon: isSuccess ? 'success' : 'error' });
-  },
-  async afterCallFunction(params, error, res) {
-    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(generateLoginUrl);
-              return;
-            }
-          }
-          app.showToast({
-            title: '接口无访问权限',
-            icon: 'error',
-          });
-        }
-      }
-    }
-  },
-});
+} from '<%= wedaRootRelativePath %>datasources/index';
 
 App({
   _query: {},

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

@@ -1,4 +1,5 @@
 import { redirectToLogin, findStatusPage } from '../util';
+import { getWedaAPI } from '@cloudbase/weda-client';
 
 Component({
   /**
@@ -36,7 +37,7 @@ Component({
       if (this.data.toLogin) {
         redirectToLogin()
       } else {
-        getApp()?.app?.relaunchHome()
+        getWedaAPI()?.app?.relaunchHome()
       }
     },
     showCustomService() {
@@ -50,13 +51,13 @@ Component({
     attached() {
       if (this.data.enableCustom) {
         const status = findStatusPage();
-        const $page = this.data.pageCodeContext || getApp()?.app?.utils.getCurrentPage();
+        const $page = this.data.pageCodeContext || getWedaAPI()?.app?.utils.getCurrentPage();
         const uuid = this.data.pageUUID || $page.uuid;
         if (status && status.id !== uuid) {
           switch (this.data.type) {
             case 'auth': {
               if( $page?.id){
-                getApp().app?.redirectTo({
+                getWedaAPI().app?.redirectTo({
                   pageId: status.id,
                   params: {
                     statusCode: "403",
@@ -69,7 +70,7 @@ Component({
               }
             }
             case 'notfound': {
-              getApp().app?.redirectTo({
+              getWedaAPI().app?.redirectTo({
                 pageId: status.id,
                 params: {
                   statusCode: "404",

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

@@ -1,5 +1,5 @@
 <view class="wd-status" wx:if="{{visible}}">
-  <view style="transform: translateY(-20px);">
+  <view style="transform: translateY(-20px);width: 100%;">
     <view class="wd-status__img {{type === 'notfound'?'wd-status--notfound':''}}">
       <view
         class="icon"
@@ -16,7 +16,7 @@
         <view class="stack">
           <view>
             <text style="font-weight: 600; font-size:14px;">错误信息：</text>
-            <text user-select="true">{{error.message}}</text>
+            <text style="font-size:14px;" user-select="true">{{error.message}}</text>
           </view>
           <!-- <view wx:if="{{error.stack}}">
             <text style="font-weight: 600;">错误堆栈：</text>

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

@@ -1,3 +1,4 @@
+import { getWedaAPI } from '@cloudbase/weda-client';
 let privacyHandler;
 // let privacyResolves = new Set();
 let closeOtherPagePopUpHooks = new Set();
@@ -31,8 +32,8 @@ Component({
    */
   data: {
     visible: false,
-    title: getApp().app.mpAppName || '用户隐私保护提示',
-    desc1: `在您使用 ${getApp().app.mpAppName || '本小程序'} 的后续服务之前，请仔细阅读并同意`,
+    title: getWedaAPI().app.mpAppName || '用户隐私保护提示',
+    desc1: `在您使用 ${getWedaAPI().app.mpAppName || '本小程序'} 的后续服务之前，请仔细阅读并同意`,
     urlTitle: '《用户隐私保护指引》。',
     desc2: '如您拒绝，则指引中提及的相关功能使用将受限。',
   },

package/template/mp/common/util.js

@@ -4,10 +4,9 @@ import { generateForContextOfWidget, generateWidgetAPIContext, getWidget } from
 import { observable, untracked } from 'mobx';
 import { getAccessToken, loginScope } from '../datasources/index';
 import { app } from '../app/weapps-api';
-export { generateDatasetQuery } from './query';
-export { generateEventFlows } from './flow';
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
+import { getWedaAPI } from '@cloudbase/weda-client'
 
 /**
  * Convert abcWordSnd -> abc-word-snd
@@ -403,13 +402,21 @@ export function set(object, path, value) {
 }
 
 export function findLoginPage() {
-  const { app } = getApp();
-  const { pages = [] } = app.__internal__.getConfig();
-  return pages.find((item) => item.type === 'login');
+  const { app } = getWedaAPI();
+  const { pages = [], loginConfigVersion } = app.__internal__.getConfig();
+  const custom = pages.find((item) => item.type === 'login')
+  if (loginConfigVersion) {
+    return custom || {
+      id: 'login',
+      packageName: '$wd_system',
+      uuid: '$wd_system/login',
+      type: 'login'
+    }
+  }
 }
 
 export function findStatusPage() {
-  const { app } = getApp();
+  const { app } = getWedaAPI();
   const { pages = [] } = app.__internal__.getConfig();
   return pages.find((item) => item.type === 'status');
 }
@@ -417,7 +424,7 @@ export function findStatusPage() {
 let _AUTH_CONFIG_CACHE = null;
 
 export async function getAuthConfig() {
-  const { app } = getApp();
+  const { app } = getWedaAPI();
   if (_AUTH_CONFIG_CACHE) {
     return _AUTH_CONFIG_CACHE;
   }
@@ -486,7 +493,7 @@ export async function checkAnonymous() {
   try {
     const { accessToken } = await getAccessToken();
     isAnonymous = !accessToken;
-    const { app } = getApp();
+    const { app } = getWedaAPI();
     // 私密链路有token则不是匿名; tcb链路会匿名登录需要多验证scope === 'anonymous'
     if (accessToken && app.__internal__.getCloudSdkConfig('endpointType') === 'tcb-api') {
       const scope = await loginScope();
@@ -513,7 +520,9 @@ export async function checkAuth(app, appId, $page) {
   <% if(skipCheckAuth){ %> return true <% } %>
 
   const loginPage = findLoginPage(app);
-  if (loginPage?.id === $page.id) {
+  const loginPageUUID = loginPage?.uuid || loginPage.id
+  const currentUUID = $page.uuid || $page.id
+  if (loginPageUUID === currentUUID) {
     return true;
   }
   const status = findStatusPage(app);
@@ -571,17 +580,20 @@ export async function checkAuth(app, appId, $page) {
 export function redirectToLogin(currentPage) {
   // 去登录则清空权限缓存。
   _AUTH_CACHE_MAP = {};
-  const { app } = getApp();
+  const { app } = getWedaAPI();
   const loginPage = findLoginPage(app);
   if (!currentPage) {
     currentPage = app.utils.getCurrentPage() || {};
   }
-  if (loginPage?.id === currentPage.id) {
+  const loginPageUUID = loginPage?.uuid || loginPage?.id
+  const currentUUID = currentPage.uuid || currentPage.id
+  if (loginPageUUID === currentUUID) {
     return true;
   }
   if (loginPage) {
     app.redirectTo({
       pageId: loginPage.id,
+      packageName: loginPage.packageName,
       params: {
         sourcePagePackageName: currentPage.__internal__.packageName || undefined,
         sourcePageId: currentPage.id,
@@ -631,7 +643,7 @@ function getEnumOptions(optionName) {
 }
 
 async function getGeneralOptions(optionName) {
-  const { app } = getApp();
+  const { app } = getWedaAPI();
   return app.cloud.callWedaApi({
     action: 'DescribeGeneralOptionsDetailList',
     data: {

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

@@ -4,13 +4,14 @@ import {
   createEventHandlers,
   checkAuth,
   getMpEventHandlerName,
-  generateDatasetQuery,
-  generateEventFlows,
   getExpiredMessage
 } from './util';
+import { generateDatasetQuery } from './query'
+import { generateEventFlows } from './flow'
 import { createWidgets, createInitData, disposeWidget, getWidget } from './widget';
 import mergeRenderer from './merge-renderer';
 import {
+  setDatasetProfiles,
   createDataset,
   EXTRA_API,
   createStateDataSourceVar,
@@ -20,7 +21,6 @@ import {
 import { runWatchers } from './watch';
 import { $w as baseAPI } from '../app/weapps-api';
 import { Event } from './event-emitter';
-import { generatePageUrl } from '@cloudbase/weda-client';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
 import { styleToCss } from './style';
 
@@ -57,7 +57,7 @@ function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShar
         }
 
         let { pageId, params, imageUrl, title, packageName } = mergedData.appShareMessage || {};
-        const url = generatePageUrl({
+        const url = ctx.app?.__internal__?.generatePageUrl({
           pageId,
           packageName,
           params: Array.isArray(params) ? params.reduce((map, { key, value }) => {
@@ -114,7 +114,14 @@ export function createPage({
   pageContext = {},
   pageAttributes = {},
   resetShare = true,
+  datasetProfile = undefined
 }) {
+  /**
+   * 单次引用
+   */
+  if (datasetProfile) {
+    setDatasetProfiles({ [pageContext.uuid || pageContext.id || id]: datasetProfile })
+  }
   widgetProps = patchWdigetPropsWithEvtListeners(widgetProps, evtListeners)
 
   const evtHandlers = createEventHandlers(evtListeners);

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

@@ -1,9 +1,12 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth, getWedaAPI } from '@cloudbase/weda-client'
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from '../common/util';
+
 const {
   setConfig,
   initTcb,
   CLOUD_SDK,
   createDataset,
+  setDatasetProfiles,
   createStateDataSourceVar,
   generateParamsParser,
   EXTRA_API,
@@ -14,6 +17,7 @@ const loginScope = auth.loginScope
 
 export {
   createDataset,
+  setDatasetProfiles,
   createStateDataSourceVar,
   generateParamsParser,
   EXTRA_API,
@@ -27,7 +31,112 @@ export {
 
 import { default as config, AEGIS_CONFIG } from './config'
 
-setConfig(config)
+setConfig({
+  ...config,
+  // 设置数据源请求的 loading 及 toast 处理
+  beforeDSRequest: (cfg) => {
+    const { app } = getWedaAPI();
+    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;
+    if (cfg.options.showLoading) app.hideLoading();
+    if (!cfg.options.showToast) return;
+    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){ %>
@@ -40,3 +149,14 @@ require.async('../packages/$wd_system/index.js').then(({ Aegis }) => {
   app.globalData._aegis = _aegis;
 })
 <% }%>
+
+// 防止报类型不匹配warning
+const originWarn = console.warn;
+const warningSkipRegexp = /(type-uncompatible)|(slot "[\w-]*?" is not found)/;
+console.warn = (...args) => {
+  // 只看第一条
+  const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
+  if (!shouldSkip) {
+    originWarn(...args);
+  }
+};

package/template/mp/packages/$wd_system/pages/login/components/input/index.js

@@ -0,0 +1,40 @@
+// pages/login/components/input.ts
+Component({
+  options: {
+    virtualHost: true,
+    styleIsolation: 'shared'
+  },
+  behaviors: ['wx://form-field'],
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    type: String,
+    placeholder: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    name: ''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    focus(e) {
+      this.triggerEvent('focus', e.detail)
+    },
+    blur(e) {
+      this.triggerEvent('blur', e.detail)
+    },
+    setValue(e) {
+      this.setData({
+        value: e.detail
+      })
+    }
+  }
+})

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

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

package/template/mp/packages/$wd_system/pages/login/components/input/index.wxml

@@ -0,0 +1,11 @@
+<view class="weda-ui weda-ui-to-wd">
+  <view style="border-width:0 0 1px 0;border-style:solid;border-color:rgba(0, 0, 0, 0.25); padding: 0 16px;" class="weda-ui weda-input wd-comp-id-input1 wd-event-focus wd-event-blur">
+    <view class="weda-ui weui-cells weui-cells_forms weui-flex">
+      <view class="weui-flex__item">
+        <view class="weui-cell__bd weui-flex">
+          <input maxlength="140" placeholder="{{placeholder}}" name="{{name}}"placeholder-class="weui-input__placeholder" type="{{type}}" class="weui-input" bind:focus="focus" bind:blur="blur" bindinput="setValue" />
+        </view>
+      </view>
+    </view>
+  </view>
+</view>