@cloudbase/lowcode-builder 0.1.0 → 0.1.4

package/lib/builder/core/index.d.ts

@@ -1,4 +1,5 @@
 import { IInstallOpts } from '../service/webpack';
+export { getCompileDirs } from '../util';
 import { IMaterialItem, IWeAppData, IPlugin, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, GenerateMpType, WebpackBuildCallBack, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';

package/lib/builder/core/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = void 0;
+exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const webpack_1 = require("../service/webpack");
 const util_1 = require("../util");
+var util_2 = require("../util");
+Object.defineProperty(exports, "getCompileDirs", { enumerable: true, get: function () { return util_2.getCompileDirs; } });
 const common_1 = require("../types/common");
 const index_1 = require("../mp/index");
 const path_1 = __importDefault(require("path"));

package/lib/builder/h5/copy.js

@@ -55,7 +55,7 @@ exports.runCopy = runCopy;
 async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDir) {
     const localPkg = (0, common_1.getCurrentPackageJson)();
     await Promise.all(dependencies.map(async (componentLib) => {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const { name, version } = componentLib;
         const materialNameVersion = `${name}@${version}`;
         const materialDir = path.join(materialsDir, materialNameVersion);
@@ -86,6 +86,9 @@ async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDi
         // 副作用修改了dependence定义，trycatch 不阻塞主流程
         try {
             const meta = (0, common_1.readComponentLibMata)(librariesDir);
+            if (meta === null || meta === void 0 ? void 0 : meta.schemaVersion) {
+                componentLib['schemaVersion'] = meta === null || meta === void 0 ? void 0 : meta.schemaVersion;
+            }
             let [major] = ((_a = meta === null || meta === void 0 ? void 0 : meta.schemaVersion) === null || _a === void 0 ? void 0 : _a.split('.')) || [];
             if (Number(major) >= 3) {
                 componentLib['isPlainProps'] = true;
@@ -94,8 +97,19 @@ async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDi
         catch (e) { }
         try {
             const packageJson = fs_extra_1.default.readJsonSync(path.join(materialDir, 'package.json'));
-            if (packageJson.lowcode) {
-                componentLib['entry'] = path.posix.relative(srcDir, packageJson.lowcode);
+            if ((_c = (_b = packageJson.weda) === null || _b === void 0 ? void 0 : _b.platform) === null || _c === void 0 ? void 0 : _c.web) {
+                const entries = (_e = (_d = packageJson.weda) === null || _d === void 0 ? void 0 : _d.platform) === null || _e === void 0 ? void 0 : _e.web;
+                componentLib['entries'] = {
+                    entry: path.posix.relative(srcDir, entries.entry),
+                    components: path.posix.relative(srcDir, entries.components),
+                    actions: path.posix.relative(srcDir, entries.actions),
+                };
+            }
+            else if (packageJson.lowcode) {
+                const entry = path.posix.relative(srcDir, packageJson.lowcode);
+                componentLib['entries'] = {
+                    entry,
+                };
             }
         }
         catch (e) { }

package/lib/builder/mp/index.js

@@ -93,31 +93,42 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
     await generateFramework(mainAppData, miniprogramRoot, buildContext);
     // #3 生成主包根路径文件
-    let appFileData = {
-        'common/style.js': {},
-        'common/utils.wxs': {
-            domain: domain,
-        },
-        'common/util.js': {
-            isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-        },
-        'common/widget.js': {},
-        'common/url.js': {},
-        'common/weapp-sdk.js': {},
-        'common/weapp-page.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/weapp-component.js': {},
-        'common/merge-renderer.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/process.js': {},
-        'common/data-patch.js': {},
-        'common/event-emitter.js': {},
-        'common/watch.js': {},
-    };
+    let appFileData = {};
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        await generateFramework(mainAppData, miniprogramRoot, buildContext);
+        // 有了 framework app 之后，并且是源码的方式,追加 app 引用
+        if (mainAppData.mpPkgUrl) {
+            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+            let appJsContent = await fs.readFile(appJsPath);
+            await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+        }
+        appFileData = {
+            ...appFileData,
+            'common/style.js': {},
+            'common/utils.wxs': {
+                domain: domain,
+            },
+            'common/util.js': {
+                isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
+            },
+            'common/widget.js': {},
+            'common/url.js': {},
+            'common/weapp-sdk.js': {},
+            'common/weapp-page.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/weapp-component.js': {},
+            'common/merge-renderer.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/process.js': {},
+            'common/data-patch.js': {},
+            'common/event-emitter.js': {},
+            'common/watch.js': {},
+        };
+    }
     if (mainAppData.mpPkgUrl) {
         // 合并 project 和 app json
         if (!projectConfigJson.setting) {
@@ -142,9 +153,6 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         }
         appJson.subpackages = subpackages;
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
-        let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-        let appJsContent = await fs.readFile(appJsPath);
-        await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
     }
     else {
         appFileData = {
@@ -178,26 +186,28 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         await fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
     }
     // 生成数据源
-    const datasourceFileData = {
-        'datasources/index.js': {},
-        'datasources/config.js.tpl': {
-            envID: mainAppData.envId,
-            appID: appId,
-            resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-            isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
-        },
-        'datasources/datasource-profiles.js.tpl': {
-            datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
-                datasources.push(...(app.datasources || []));
-                return datasources;
-            }, [])), { EOL: true }),
-        },
-        'datasources/dataset-profiles.js.tpl': {
-            datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
-        },
-    };
-    console.log('Generating ' + em('datasources') + ' files');
-    await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        const datasourceFileData = {
+            'datasources/index.js': {},
+            'datasources/config.js.tpl': {
+                envID: mainAppData.envId,
+                appID: appId,
+                resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
+                isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+            },
+            'datasources/datasource-profiles.js.tpl': {
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
+                    datasources.push(...(app.datasources || []));
+                    return datasources;
+                }, [])), { EOL: false }),
+            },
+            'datasources/dataset-profiles.js.tpl': {
+                datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
+            },
+        };
+        console.log('Generating ' + em('datasources') + ' files');
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index == 0) {

package/lib/builder/mp/wxml.js

@@ -105,7 +105,11 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 elements.push({
                     type: 'element',
                     name: tagName,
-                    attributes: { name: data0.name.value },
+                    attributes: {
+                        name: data0.name.type && data0.name.type !== 'static'
+                            ? `{{${id}.name}}`
+                            : data0.name.value,
+                    },
                     elements: [],
                     _order: xIndex || 0,
                     _parent: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -26,14 +26,15 @@
     "dev": "tsc -w",
     "develop": "tsc -w",
     "build": "tsc",
-    "test": "jest"
+    "test": "jest",
+    "test:build": "ts-node ./__test__/build.ts"
   },
   "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.6.13",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
@@ -67,4 +68,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^4.4.2"
   }
-}
+}

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;
 

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

@@ -1,5 +1,5 @@
-import dataSourceProfiles from './datasource-profiles'
 import datasetProfiles from './dataset-profiles'
+const dataSourceProfiles = require('./datasource-profiles.js')
 
 /**
  * 数据源基本配置

package/template/mp/datasources/datasource-profiles.js.tpl

@@ -1,4 +1,4 @@
 /**
  * 数据源摘要描述数组
  */
-export default <%= datasourceProfiles %>
+module.exports = <%= datasourceProfiles %>

package/template/mp/datasources/index.js

@@ -1,8 +1,16 @@
-import {
+import { WEDA_CLOUD_SDK } 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
+
 export {
   createDataset,
   createStateDataSourceVar,
@@ -11,7 +19,8 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-} from '@cloudbase/weda-cloud-sdk'
+  setConfig
+}
 
 import config from './config'
 

package/template/mp/package.json

@@ -1,15 +1,16 @@
 {
 	"name": "lcap-<%= appId%>",
-	"version": "1.0.0",
-	"scripts": {	},
+	"version": "1.0.8",
+	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-cloud-sdk": "stable",
-    "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]%>"<%})
+		"@cloudbase/weda-client": "stable",
+		"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]%>"<%
+		})
 		%>
-  }
-}
+	}
+}