@cloudbase/lowcode-builder 1.8.93 → 1.8.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.93",
+  "version": "1.8.94",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -48,7 +48,7 @@
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
     "@cloudbase/cals": "^1.0.75",
-    "@cloudbase/lowcode-generator": "^1.8.26",
+    "@cloudbase/lowcode-generator": "^1.8.27",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -516,7 +516,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.58/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.59/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -545,7 +545,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.62f12205519ca1129c4b.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.399c0d6128e9bf679e96.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -8,13 +8,17 @@ import { createDataset } from '<%= subLevelPath %>../datasources/index'
 
 import lodashGet from 'lodash.get';
 import config from '<%= subLevelPath %>../common/config';
+import { watchAndSyncDatasetState2Local } from '<%= subLevelPath %>../common/watch';
+
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../lowcode/computed'` : "const computed = {}" %>
 <%= importor.common? `import common from './common'` : "const common = {}" %>
 
-const mainAppKey = '__weappsMainApp'
+const mainAppKey = '__weappsMainApp';
+let GLOBAL_DATASET_SYNC_DISPOSES = [];
+
 
 <% function printBoundData(boundData={}) {
   /**
@@ -112,7 +116,9 @@ function createGlboalApi() {
     return globalAPI.__internal__.getConfig()
   }
 
-  let dataset = createDataset('$global')
+  let dataset = createDataset('$global', undefined, {
+    appId: globalAPI.id
+  })
   dataset.query = generateDatasetQuery({<% Object.entries(appQuery).map(([id, item])=>{%>
     <%= id %>: { <% const { dataBinds, eventHandlers, handler, ...rest } = item %>
       ...(<%= JSON.stringify(rest, undefined, 2) %>),
@@ -124,7 +130,14 @@ function createGlboalApi() {
     $app: globalAPI,
     $w: globalAPI.__internal__.$w,
   })
+
+  GLOBAL_DATASET_SYNC_DISPOSES.forEach((dispose) => {
+    dispose?.();
+  });
+  GLOBAL_DATASET_SYNC_DISPOSES = [];
   globalAPI.dataset = dataset
+  GLOBAL_DATASET_SYNC_DISPOSES = watchAndSyncDatasetState2Local(globalAPI.id, '$global', globalAPI.dataset.state);
+
   globalAPI.state.dataset = dataset
   globalAPI.setState = (userSetState) => {
     Object.keys(userSetState).forEach((keyPath) => {

package/template/mp/common/watch.js

@@ -1,5 +1,6 @@
 import { autorun, reaction } from 'mobx'
 import { getDeep } from './util'
+import { getDatasetProfiles, setLocalDatasetState } from '../datasources/index'
 
 /**
  *
@@ -48,3 +49,22 @@ function parseWatcher(watcher) {
   if (!(handler instanceof Function)) return
   return { handler, immediate }
 }
+
+export function watchAndSyncDatasetState2Local(appId, datasetProfileKey, dataset) {
+  const disposes = [];
+  const stateProfile = getDatasetProfiles(datasetProfileKey)?.state || {};
+  for (const key in stateProfile) {
+    const config = stateProfile[key];
+    if (config.enableSyncLocal) {
+      const dispose = autorun((r) => {
+        try {
+          setLocalDatasetState(appId, datasetProfileKey, key, dataset[key]);
+        } catch (e) {
+          console.error('setLocalDatasetState error:', e);
+        }
+      });
+      disposes.push(dispose);
+    }
+  }
+  return disposes;
+}

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

@@ -18,7 +18,7 @@ import {
   generateParamsParser,
   setConfig,
 } from '../datasources/index';
-import { runWatchers } from './watch';
+import { runWatchers, watchAndSyncDatasetState2Local } from './watch';
 import { $w as baseAPI } from '../app/weapps-api';
 import { Event } from './event-emitter';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
@@ -378,13 +378,23 @@ export function createPage({
           return result;
         }, {});
         $page.computed = createComputed(computed, $page);
-        let dataset = createDataset($page.uuid);
+        let dataset = createDataset($page.uuid, undefined, {
+          appId: app.id
+        });
         dataset.query = generateDatasetQuery(datasetQuery, {
           $w: $page.__internal__.$w,
           $app: app,
           $page,
         });
+        this._disposers.push(...Object.values(dataset.query).map(query=>{
+          return function dispose() {
+            try {
+              query?.destroy?.()
+            } catch(e) {}
+          }
+        }))
         $page.dataset = dataset;
+        this._disposers.push(...watchAndSyncDatasetState2Local(app.id, $page.uuid, $page.dataset.state))
         $page.state.dataset = dataset;
         $page.setState = (userSetState) => {
           Object.keys(userSetState).forEach((keyPath) => {

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

@@ -6,17 +6,20 @@ const {
   initTcb,
   CLOUD_SDK,
   createDataset,
+  getDatasetProfiles,
   setDatasetProfiles,
   createStateDataSourceVar,
   generateParamsParser,
   EXTRA_API,
   DS_SDK,
+  setLocalDatasetState
 } = WEDA_CLOUD_SDK
 const getAccessToken = auth.getAccessToken
 const loginScope = auth.loginScope
 
 export {
   createDataset,
+  getDatasetProfiles,
   setDatasetProfiles,
   createStateDataSourceVar,
   generateParamsParser,
@@ -27,6 +30,7 @@ export {
   getAccessToken,
   loginScope,
   initTcb,
+  setLocalDatasetState
 }
 
 import { default as config, AEGIS_CONFIG } from './config'

package/template/mp/package.json

@@ -5,8 +5,8 @@
   "dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.28",
-    "@cloudbase/weda-cloud-sdk": "1.0.58",
+    "@cloudbase/weda-client": "1.0.29",
+    "@cloudbase/weda-cloud-sdk": "1.0.59",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",