@cloudbase/lowcode-builder 0.1.1 → 0.1.5-mp-beta

package/lib/builder/util/generateFiles.js

@@ -22,12 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = void 0;
+exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_template_1 = __importDefault(require("lodash.template"));
 const junk = __importStar(require("../util/junk"));
 const glob_1 = __importDefault(require("glob"));
+const jszip_1 = __importDefault(require("jszip"));
+const buffer_1 = require("buffer");
 const generatedFileContents = {}; // generated files for incrmental build
 async function generateFiles(appFileData, srcDir, dstDir, ctx) {
     const filesGenerated = [];
@@ -120,3 +122,120 @@ async function copy(src, dest) {
     await copyFiles(needCopyFiles, src, dest);
 }
 exports.copy = copy;
+/**
+ * 复制文件
+ * @param source 源文件
+ * @param target 目标文件
+ */
+function copyFileSync(source, target) {
+    let targetFile = target;
+    // If target is a directory, a new file with the same name will be created
+    if (fs_extra_1.default.existsSync(target)) {
+        if (fs_extra_1.default.lstatSync(target).isDirectory()) {
+            targetFile = path_1.default.join(target, path_1.default.basename(source));
+        }
+    }
+    fs_extra_1.default.writeFileSync(targetFile, fs_extra_1.default.readFileSync(source));
+}
+exports.copyFileSync = copyFileSync;
+/**
+ * 根据源文件目录，输出目录，递归复制文件
+ * @param {string} src  源文件目录
+ * @param {string} dest 输出目录
+ */
+const copyRecursiveSync = function (src, dest) {
+    var exists = fs_extra_1.default.existsSync(src);
+    var stats = exists && fs_extra_1.default.statSync(src);
+    var isDirectory = exists && stats.isDirectory();
+    if (!fs_extra_1.default.existsSync(dest)) {
+        mkDirByPathSync(path_1.default.parse(dest).dir);
+    }
+    if (isDirectory) {
+        const files = fs_extra_1.default.readdirSync(src);
+        files.forEach(function (childItemName) {
+            (0, exports.copyRecursiveSync)(path_1.default.join(src, childItemName), path_1.default.join(dest, childItemName));
+        });
+    }
+    else {
+        copyFileSync(src, dest);
+    }
+};
+exports.copyRecursiveSync = copyRecursiveSync;
+/**
+ * 参考：https://stackoverflow.com/questions/31645738/how-to-create-full-path-with-nodes-fs-mkdirsync
+ * @param targetDir
+ * @param param1
+ * @returns
+ */
+function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
+    const sep = path_1.default.sep;
+    const initDir = path_1.default.isAbsolute(targetDir) ? sep : '';
+    const baseDir = isRelativeToScript ? __dirname : '.';
+    return targetDir.split(sep).reduce((parentDir, childDir) => {
+        const curDir = path_1.default.resolve(baseDir, parentDir, childDir);
+        try {
+            fs_extra_1.default.mkdirSync(curDir);
+        }
+        catch (err) {
+            if (err.code === 'EEXIST') { // curDir already exists!
+                return curDir;
+            }
+            // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
+            if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
+                throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
+            }
+            const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
+            if (!caughtErr || caughtErr && curDir === path_1.default.resolve(targetDir)) {
+                throw err; // Throw if it's just the last created dir.
+            }
+        }
+        return curDir;
+    }, initDir);
+}
+/**
+ * 返回指定目录的文件列表内容，返回map格式
+ * @param dir 指定目录
+ * @param files_ 文件列表
+ * @param replacePath 去掉前面路径
+ * @returns
+ */
+function getFiles(dir, files_, replacePath = '') {
+    files_ = files_ || {};
+    const files = fs_extra_1.default.readdirSync(dir);
+    let mapName;
+    for (let i in files) {
+        const name = path_1.default.join(dir, files[i]);
+        if (fs_extra_1.default.statSync(name).isDirectory()) {
+            getFiles(name, files_, replacePath);
+        }
+        else {
+            mapName = name;
+            // 替换根路径
+            if (name.indexOf(replacePath) === 0) {
+                mapName = name.replace(replacePath, '');
+            }
+            files_[mapName] = fs_extra_1.default.readFileSync(name);
+        }
+    }
+    return files_;
+}
+exports.getFiles = getFiles;
+/**
+ * 将文件压缩为zip包
+ * 参考JSZip例子：https://stuk.github.io/jszip/documentation/examples/download-zip-file.html
+ * @param files
+ * @param type
+ * @returns
+ */
+async function fileToZip(files, type) {
+    var zip = new jszip_1.default();
+    for (let prop in files) {
+        zip.file(prop, files[prop]);
+    }
+    return zip.generateAsync({ type });
+}
+exports.fileToZip = fileToZip;
+function strToBuf(str) {
+    return buffer_1.Buffer.from(str);
+}
+exports.strToBuf = strToBuf;

package/lib/builder/util/net.d.ts

@@ -4,4 +4,23 @@ export declare function downloadFile(url: string, filePath: string): Promise<voi
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-export declare function downloadZip(url: string, dstDir: string): Promise<void>;
+export declare function downloadZip(url: string, dstDir: string, isBrowser?: boolean): Promise<void>;
+/**
+ * node中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ */
+export declare function downloadZipInNode(url: string, dstDir: string): Promise<void>;
+/**
+ * 浏览器中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ * @returns
+ */
+export declare function downloadZipInBrowser(url: string, dstDir: string): Promise<void>;
+/**
+ * 微信IDE builder需要下载template文件和miniprogram_npm
+ * miniprogram_npm待微信提供端能力
+ * @param output
+ */
+export declare function downloadBrowserMaterial(output?: string): Promise<void>;

package/lib/builder/util/net.js

@@ -22,11 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadZip = exports.downloadFile = void 0;
+exports.downloadBrowserMaterial = exports.downloadZipInBrowser = exports.downloadZipInNode = exports.downloadZip = exports.downloadFile = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path = __importStar(require("path"));
 const compressing_1 = __importDefault(require("compressing"));
+const jszip_1 = __importDefault(require("jszip"));
+const config_1 = require("../config");
+const generateFiles_1 = require("../util/generateFiles");
 async function downloadFile(url, filePath) {
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
     const res = await axios_1.default.get(url, { responseType: 'stream' });
@@ -38,9 +41,75 @@ exports.downloadFile = downloadFile;
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-async function downloadZip(url, dstDir) {
+async function downloadZip(url, dstDir, isBrowser = false) {
+    // TODO 待加上平台判断
+    if (isBrowser) {
+        await downloadZipInBrowser(url, dstDir);
+        return;
+    }
+    await downloadZipInNode(url, dstDir);
+}
+exports.downloadZip = downloadZip;
+/**
+ * node中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ */
+async function downloadZipInNode(url, dstDir) {
     await fs_extra_1.default.ensureDir(dstDir);
     const res = await axios_1.default.get(url, { responseType: 'stream' });
     await compressing_1.default.zip.uncompress(res.data, dstDir);
 }
-exports.downloadZip = downloadZip;
+exports.downloadZipInNode = downloadZipInNode;
+/**
+ * 浏览器中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ * @returns
+ */
+async function downloadZipInBrowser(url, dstDir) {
+    // IMPORTANT 防止保存的时候保存
+    if (fs_extra_1.default.existsSync(dstDir)) {
+        return;
+    }
+    fs_extra_1.default.ensureDirSync(dstDir);
+    const res = await axios_1.default.get(url, { responseType: 'arraybuffer' });
+    const data = await jszip_1.default.loadAsync(res.data);
+    await saveFiles(data.files, dstDir);
+}
+exports.downloadZipInBrowser = downloadZipInBrowser;
+/**
+ * 保存JSZip解压的文件内容
+ * @param files 文件
+ * @param dstDir 指定目录
+ */
+async function saveFiles(files, dstDir) {
+    try {
+        for (const fileName of Object.keys(files)) {
+            const dest = path.join(dstDir, fileName);
+            if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
+                fs_extra_1.default.mkdirSync(dest, {
+                    recursive: true
+                });
+            }
+            else {
+                const ret = await files[fileName].async('nodebuffer'); // 由于这里有await，不能用forEach
+                fs_extra_1.default.writeFileSync(dest, ret);
+            }
+        }
+    }
+    catch (err) {
+        console.error('saveFiles catch error：', err);
+    }
+}
+/**
+ * 微信IDE builder需要下载template文件和miniprogram_npm
+ * miniprogram_npm待微信提供端能力
+ * @param output
+ */
+async function downloadBrowserMaterial(output = '.weapps-build') {
+    await Promise.all([downloadZip(config_1.builderTemplateURL, config_1.appTemplateDir, true), downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, true)]);
+    // 必须先下载到.weapps-materials目录，因为.weapps-materials是默认下载目录，共享组件逻辑sharedMaterialsDir时会读取文件
+    (0, generateFiles_1.copyRecursiveSync)(config_1.miniprogramDir, path.join(output, 'miniprogram_npm'));
+}
+exports.downloadBrowserMaterial = downloadBrowserMaterial;

package/lib/types.d.ts

@@ -11,3 +11,4 @@ export declare enum HISTORY_TYPE {
     BROWSER = "BROWSER",
     HASH = "HASH"
 }
+export { PropBindType } from '@cloudbase/cals';

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HISTORY_TYPE = exports.RUNTIME = exports.DEPLOY_MODE = void 0;
+exports.PropBindType = exports.HISTORY_TYPE = exports.RUNTIME = exports.DEPLOY_MODE = void 0;
 var DEPLOY_MODE;
 (function (DEPLOY_MODE) {
     DEPLOY_MODE["PREVIEW"] = "preview";
@@ -17,3 +17,5 @@ var HISTORY_TYPE;
     HISTORY_TYPE["BROWSER"] = "BROWSER";
     HISTORY_TYPE["HASH"] = "HASH";
 })(HISTORY_TYPE = exports.HISTORY_TYPE || (exports.HISTORY_TYPE = {}));
+var cals_1 = require("@cloudbase/cals");
+Object.defineProperty(exports, "PropBindType", { enumerable: true, get: function () { return cals_1.PropBindType; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.1",
+  "version": "0.1.5-mp-beta",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -25,31 +25,43 @@
   "scripts": {
     "dev": "tsc -w",
     "develop": "tsc -w",
-    "build": "tsc",
-    "test": "jest"
+    "build": "rm -rf lib && tsc",
+    "test": "jest",
+    "test:build": "ts-node ./__test__/build.ts",
+    "dev:mpweb": "rm -rf dist && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/mpweb.config.js",
+    "build:mpweb": "rm -rf dist && cross-env NODE_ENV=production webpack --config ./webpack/mpweb.config.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "0.3.3",
-    "@cloudbase/lowcode-generator": "0.5.1",
+    "@cloudbase/cals": "^0.3.3",
+    "@cloudbase/lowcode-generator": "0.4.22-mp-beta",
     "axios": "^0.21.0",
+    "browserfs": "^1.4.3",
+    "browserify-zlib": "^0.2.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
     "compressing": "^1.4.0",
     "cross-spawn": "^6.0.5",
     "fs-extra": "^7.0.1",
+    "constants-browserify": "^1.0.0",
+    "crypto-browserify": "^3.12.0",
+    "jszip": "^3.7.1",
     "lodash": "^4.17.11",
     "lodash.clone": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
     "lodash.template": "^4.5.0",
     "lodash.uniqby": "^4.7.0",
+    "os-browserify": "^0.3.0",
+    "stream-browserify": "^3.0.0",
     "webpack": "^4.41.4",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
+    "worker-loader": "^3.0.8",
+    "@rollup/plugin-alias": "^3.1.9",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -63,8 +75,10 @@
     "@types/weixin-app": "^2.9.0",
     "csstype": "^2.6.10",
     "jest": "^26.0.1",
-    "ts-jest": "^27.0.5",
+    "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.2",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.7.3"
   }
 }

package/template/html/index.html.ejs

@@ -26,8 +26,8 @@
     <% if(mode !== 'production'){ %>
     <!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
     <script>new VConsole()</script> -->
-    <% }%> <% Array.isArray(jsApis) &&
-    jsApis.filter(function(item){return !!item}).forEach(function(jsApi){%>
+    <% }%> <% Array.isArray(jsApis) && jsApis.filter(function(item){return
+    !!item}).forEach(function(jsApi){%>
     <script src="<%=jsApi %>"></script>
     <% })%>
 
@@ -373,10 +373,8 @@
     <div id="root" class="main-wrap"></div>
     <% if(canUseVite){ %>
     <script type="module" src="/src/index.jsx"></script>
-    <% } %>
-
-    <% if(!isAdminPortal){ %>
-    <script src="//imgcache.qq.com/qcloud/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js"></script>
+    <% } %> <% if(!isAdminPortal){ %>
+    <script src="https://imgcache.qq.com/qcloud/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js"></script>
     <% }%>
     <script>
       if (window.cloudbase) {
@@ -431,10 +429,9 @@
       }
     </script>
     <script
-      src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
       crossorigin="anonymous"
     ></script>
-    <script src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@stable/dist/h5.browser.js"></script>
-    <script src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
+    <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
   </body>
 </html>

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

@@ -1,19 +1,19 @@
 import { observable } from 'mobx'
-import { createComputed, formatDate, getter, setter } from '<%= subLevelPath %>../common/util'
+import { createMpApp } from '@cloudbase/weda-client';
+import { createComputed } from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
-import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
-import weappApis from '<%= subLevelPath %>../common/weapp-sdk'
+import { createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 
 <% if (!isBare) {%>
 import state from '../lowcode/state'
-import computed from '../lowcode/computed'
-import common from './common'
+  import computed from '../lowcode/computed'
+  import common from './common'
 <%} else {%>
 const state = {}
-const computed ={}
-const common = {}
-<%}%>
+  const computed = {}
+  const common = {}
+    <%}%>
 
 const mainAppKey = '__weappsMainApp'
 
@@ -21,12 +21,11 @@ export const app = createGlboalApi()
 export { process }
 
 function createGlboalApi() {
+  const mpApp = createMpApp();
   const globalAPI = {
     id: '<%= appId %>',
     domain: '<%= domain %>',
-    platform: 'MINIPROGRAME',
     activePage: null,
-    dataSources: DS_SDK,
     pages: {},
     session: {
       //configure: sdk.configure,
@@ -36,11 +35,7 @@ function createGlboalApi() {
     state: observable(state),
     computed: createComputed(computed),
     common,
-    utils: {
-      formatDate,
-      get: getter,
-      set: setter,
-    },
+    ...mpApp
     // ... other sdk apis & apis from mp
   } // The global api exposed to lowcode
 
@@ -52,18 +47,16 @@ function createGlboalApi() {
       globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
-   /**
-   * 内部通用的设置状态变量值的方法
-   *  varPath 结构为 $global.<变量名> 即全局变量
-   *                $page.<变量名>  即当前页面变量
-   *                <pageId>.<变量名> 指定页面 pageId 的变量 (应当避免修改非当前页面的变量值)
-   */
+  /**
+  * 内部通用的设置状态变量值的方法
+  *  varPath 结构为 $global.<变量名> 即全局变量
+  *                $page.<变量名>  即当前页面变量
+  *                <pageId>.<变量名> 指定页面 pageId 的变量 (应当避免修改非当前页面的变量值)
+  */
   globalAPI._setStateVal = (config) => {
     // @ts-ignore
     EXTRA_API.setState(config.varPath, config.val);
   };
-  // mount wx apis
-  Object.assign(globalAPI, weappApis)
 
   const subPackageName = '<%= subPackageName %>'
   if (subPackageName) {
@@ -75,33 +68,12 @@ function createGlboalApi() {
     // is mainApp
     appGlobal[mainAppKey] = globalAPI
   }
-  // 避免被wx.cloud 覆盖
-  globalAPI.cloud = CLOUD_SDK
 
   // # expose some sdk modules
   /* const sdkModsIncluded = ['flow', 'getPageOptions', 'getLaunchOptions']
   sdkModsIncluded.forEach(key => {
     globalAPI[key] = sdk[key]
   }) */
-  const { scanCode } = globalAPI
-  globalAPI.scanCode = (options) => {
-    const {enableDefaultBehavior, ...restOptions} = options;
-    const shouldReturnPromise = (!restOptions.success && !restOptions.complete && !restOptions.fail);
-    if(shouldReturnPromise) {
-      return new Promise((resolve, reject) => {
-        scanCode(restOptions).then((res) => {
-          if(enableDefaultBehavior) {
-            globalAPI.showModal({
-              title: '扫描到以下内容',
-              content: res.result,
-              showCancel: false,
-            })
-          }
-          resolve(res)
-        })
-        .catch(reject)
-      })
-    }
-  }
+
   return globalAPI
 }

package/template/mp/app.js

@@ -1,79 +1,79 @@
-import { setConfig } from '@cloudbase/weda-cloud-sdk'
+import { setConfig } from './datasources/index'
 import lifeCycle from './lowcode/lifecycle'
 import { app } from './app/weapps-api'
 import WxReportV2 from './common/wx_yypt_report_v2'
 // 引入数据源管理器并进行初始化
 import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
 const $app = app;
-<% if(yyptConfig.yyptAppKey) { %>
+<% if (yyptConfig.yyptAppKey) { %>
 const wxReport = new WxReportV2({
-    appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
-    reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
-    autoReportPV: true, // 是否自动上报页面PV
-    // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
-    // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
-    getRemoteParamsUrl: '',
-    stopReport: <%= yyptConfig.stopReport %>, // 停止上报
-    intervalTime: 3, // 间隔多久执行一次上报，默认3秒
-    reportLogsNum: 5, // 每次合并上报记录条数，默认5次
+  appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
+  reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
+  autoReportPV: true, // 是否自动上报页面PV
+  // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
+  // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
+  getRemoteParamsUrl: '',
+  stopReport: <%= yyptConfig.stopReport %>, // 停止上报
+  intervalTime: 3, // 间隔多久执行一次上报，默认3秒
+  reportLogsNum: 5, // 每次合并上报记录条数，默认5次
 });
 
-// 设置数据源请求的 loading 及 toast 处理
-setConfig({
-  beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return
-    app.showLoading()
-  },
-  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'})
-  }
-})
-
-<% }%>
-App({
-  onLaunch(options) {
-    this.app = app
-    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
-    let { query={} } = options
-    EXTRA_API.setParams('$global', query )
-    createStateDataSourceVar('$global', generateParamsParser({app}))
+  // 设置数据源请求的 loading 及 toast 处理
+  setConfig({
+    beforeDSRequest: (cfg) => {
+      if (!cfg.options || !cfg.options.showLoading) return
+      app.showLoading()
+    },
+    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' })
+    }
+  })
 
-    onLaunch && onLaunch.call(this, options)
-    <% if(yyptConfig.yyptAppKey) { %>
-    // 挂运营平台上报对象到app里
-    app.yyptReport = wxReport
     <% }%>
+      App({
+        onLaunch(options) {
+          this.app = app
+          const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
+          let { query = {} } = options
+          EXTRA_API.setParams('$global', query)
+          createStateDataSourceVar('$global', generateParamsParser({ app }))
 
-    // 初始私有全局数据
-    this.$$global = {
-      homePageId: '<%= appConfig.homePageId %>'
-    }
-  },
-  onShow(options) {
-    const fn = lifeCycle.onShow || lifeCycle.onAppShow
-    fn && fn.call(this, options)
-    <% if(yyptConfig.yyptAppKey) { %>
-    wxReport.startReport()
-    <% }%>
-  },
-  onHide() {
-    const fn = lifeCycle.onHide || lifeCycle.onAppHide
-    fn && fn.call(this)
-  },
-  onError(msg) {
-    const fn = lifeCycle.onError || lifeCycle.onAppError
-    fn && fn.call(this, msg)
-  },
-  onPageNotFound() {
-    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
-    fn && fn.call(this)
-  },
-  onUnhandledRejection() {
-    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
-    fn && fn.call(this)
+          onLaunch && onLaunch.call(this, options)
+            <% if (yyptConfig.yyptAppKey) { %>
+              // 挂运营平台上报对象到app里
+              app.yyptReport = wxReport
+                <% }%>
+
+                  // 初始私有全局数据
+                  this.$$global = {
+            homePageId: '<%= appConfig.homePageId %>'
+          }
+        },
+        onShow(options) {
+          const fn = lifeCycle.onShow || lifeCycle.onAppShow
+          fn && fn.call(this, options)
+            <% if (yyptConfig.yyptAppKey) { %>
+              wxReport.startReport()
+              <% }%>
   },
-})
+        onHide() {
+          const fn = lifeCycle.onHide || lifeCycle.onAppHide
+          fn && fn.call(this)
+        },
+        onError(msg) {
+          const fn = lifeCycle.onError || lifeCycle.onAppError
+          fn && fn.call(this, msg)
+        },
+        onPageNotFound() {
+          const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
+          fn && fn.call(this)
+        },
+        onUnhandledRejection() {
+          const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
+          fn && fn.call(this)
+        },
+      })

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

@@ -2,7 +2,7 @@ import { observable } from 'mobx';
 import { createComputed, createEventHandlers, checkAuth } from './util';
 import { createWidgets, createInitData, disposeWidget } from './widget';
 import mergeRenderer from './merge-renderer';
-import { createDataset, EXTRA_API, createStateDataSourceVar, generateParamsParser } from '../datasources/index';
+import { createDataset, EXTRA_API, createStateDataSourceVar, generateParamsParser, setConfig } from '../datasources/index';
 import { runWatchers } from './watch'
 
 export function createPage(
@@ -71,6 +71,7 @@ export function createPage(
       ...mergeRenderer,
       onLoad(options) {
         const $page = this.getWeAppInst()
+        setConfig({ currentPageId: $page.uuid });
         app.activePage = $page;
         this._pageActive = true;
 
@@ -97,6 +98,7 @@ export function createPage(
       },
       async onShow() {
         const $page = this.getWeAppInst()
+        setConfig({ currentPageId: $page.uuid });
         app.activePage = $page;
         this._pageActive = true;