@cloudbase/lowcode-builder 0.1.8 → 0.1.11

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

@@ -23,9 +23,9 @@ export function createPage(
   const evtHandlers = createEventHandlers(evtListeners, context);
 
   function extractLifecyles() {
-    const result = { };
-    Object.keys(lifecycle).map(name=>{
-      result[name] = function() {
+    const result = {};
+    Object.keys(lifecycle).map(name => {
+      result[name] = function () {
         return lifecycle[name].apply(this.getWeAppInst(), arguments)
       }
     })
@@ -73,7 +73,7 @@ export function createPage(
       onLoad(options) {
         const $page = this.getWeAppInst()
         setConfig({ currentPageId: $page.uuid });
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         this._pageActive = true;
 
         let query = decodePageQuery(options || {});
@@ -100,14 +100,14 @@ export function createPage(
       async onShow() {
         const $page = this.getWeAppInst()
         setConfig({ currentPageId: $page.uuid });
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         this._pageActive = true;
 
         const hook = lifecycle.onShow || lifecycle.onPageShow;
         hook && hook.call($page);
 
         // 权限检查
-        if (await checkAuth(app, app.id, app.activePage.id)) {
+        if (await checkAuth(app, app.id, $page)) {
           this.setData({
             weDaHasLogin: true,
           });

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

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 云开发资源所属的微信app id */
   resourceAppid: '<%= resourceAppid %>',
   /** 数据源描述对象数组 */

package/template/mp/datasources/index.js

@@ -1,4 +1,4 @@
-import { WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 const {
   setConfig,
   initTcb,
@@ -8,7 +8,8 @@ const {
   generateParamsParser,
   EXTRA_API,
   DS_API,
-  DS_SDK
+  DS_SDK,
+  getAccessToken,
 } = WEDA_CLOUD_SDK
 
 export {
@@ -19,7 +20,9 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-  setConfig
+  setConfig,
+  getAccessToken,
+  initTcb,
 }
 
 import config from './config'

package/template/mp/package.json

@@ -3,7 +3,8 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "stable",
+		"@cloudbase/weda-client": "0.2.0",
+    "@cloudbase/oauth": "0.1.1-alpha.2",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",
 		"lodash.set": "^4.3.2",
@@ -13,4 +14,4 @@
 		})
 		%>
 	}
-}
+}

package/template/package.json

@@ -5,11 +5,11 @@
     "build-web": "rm -rf ./preivew && webpack --config ./webpack/webpack.web.prod.js"
   },
   "dependencies": {
-    "@cloudbase/js-sdk": "1.5.3-alpha.0",
+    "@cloudbase/js-sdk": "2.4.0-beta.0",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
-    "@cloudbase/weda-client": "stable",
+    "@cloudbase/weda-client": "0.2.0",
     "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",
@@ -60,4 +60,4 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"
   }
-}
+}

package/template/src/app/global-api.js

@@ -7,7 +7,7 @@ import { formatDate } from '../utils/date';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
-import { createWebApp, ACTIONS_KEY, ROUTER_KEY } from '@cloudbase/weda-client';
+import { createWebApp, _ACTIONS_KEY as ACTIONS_KEY, _ROUTER_KEY as ROUTER_KEY } from '@cloudbase/weda-client';
 import { createDataset, EXTRA_API } from '../datasources/index'
 
 const mainAppKey = '__weappsMainApp';

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

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 数据源描述对象数组 */
   dataSourceProfiles: dataSourceProfiles,
   /**

package/template/src/datasources/index.js

@@ -1,4 +1,4 @@
-import { WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 import config from './config';
 
 const {
@@ -10,7 +10,8 @@ const {
   generateParamsParser,
   EXTRA_API,
   DS_API,
-  DS_SDK
+  DS_SDK,
+  getAccessToken,
 } = WEDA_CLOUD_SDK
 
 export {
@@ -21,7 +22,9 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-  setConfig
+  setConfig,
+  initTcb,
+  getAccessToken,
 }
 
 setConfig(config);