@cloudbase/lowcode-builder 1.8.41 → 1.8.43-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.41",
+  "version": "1.8.43-alpha.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.28",
+    "@cloudbase/cals": "^1.0.29",
     "@cloudbase/lowcode-generator": "^1.8.14",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -540,7 +540,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a207b16aa366c3eac570.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.2d2239ac89ba2c135587.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -1,10 +1,13 @@
+import { redirectToLogin, findLoginPage } from '../util';
+
 Component({
   /**
    * 组件的属性列表
    */
   properties: {
     type: String,
-    message: String
+    message: String,
+    toLogin: Boolean
   },
 
   /**
@@ -19,10 +22,19 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    login() {
+      if(this.data.toLogin) {
+        redirectToLogin()
+      } else {
+        getApp()?.app?.relaunchHome()
+      }
+    }
   },
   lifetimes: {
     attached() {
+      this.setData({
+        toLogin: findLoginPage()
+      })
       setTimeout(() => {
         const data = {
           visible: true

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

@@ -10,4 +10,5 @@
   <view class="text" id="message">
     {{message}}
   </view>
+  <button wx:if="{{type == 'auth' && toLogin}}" style="margin-top: 10px; width: 200rpx;" variant="outline" type="default" size="mini" plain="true" bind:tap="login">{{toLogin?'登录':'刷新'}}</button>
 </view>

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

@@ -15,6 +15,7 @@
   display: flex;
   justify-content: center;
   text-align: center;
+  margin-top: -200rpx;
   margin-bottom: 50rpx;
 }
 
@@ -41,4 +42,4 @@
 @keyframes spCircRot {
   from { transform: rotate(0deg); }
   to { transform: rotate(359deg); }
-}
+}

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

@@ -0,0 +1,133 @@
+let privacyHandler;
+// let privacyResolves = new Set();
+let closeOtherPagePopUpHooks = new Set();
+
+const isSuportPrivacyApi = wx.onNeedPrivacyAuthorization && wx.requirePrivacyAuthorize && wx.openPrivacyContract;
+
+if (wx.onNeedPrivacyAuthorization) {
+  wx.onNeedPrivacyAuthorization((resolve) => {
+    if (typeof privacyHandler === 'function') {
+      privacyHandler(resolve);
+    }
+  });
+}
+
+const closeOtherPagePopUp = (closePopUp) => {
+  closeOtherPagePopUpHooks.forEach((hook) => {
+    if (closePopUp !== hook) {
+      hook();
+    }
+  });
+};
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {},
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    visible: false,
+    title: getApp().app.mpAppName || '用户隐私保护提示',
+    desc1: `在您使用 ${getApp().app.mpAppName || '本小程序'} 的后续服务之前，请仔细阅读并同意`,
+    urlTitle: '《用户隐私保护指引》。',
+    desc2: '如您拒绝，则指引中提及的相关功能使用将受限。',
+  },
+
+  lifetimes: {
+    created() {
+      this.resolvers = new Set();
+    },
+    attached: function () {
+      this.resolvers = new Set();
+      const closePopUp = () => {
+        this.close();
+      };
+      privacyHandler = (resolve) => {
+        this.resolvers.add(resolve);
+        this.show();
+
+        // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+        closeOtherPagePopUp(closePopUp);
+      };
+
+      this.closePopUp = closePopUp;
+      closeOtherPagePopUpHooks.add(this.closePopUp);
+    },
+    detached: function () {
+      this.handleDisagree();
+      closeOtherPagePopUpHooks.delete(this.closePopUp);
+    },
+  },
+
+  pageLifetimes: {
+    show() {
+      if (this.closePopUp) {
+        privacyHandler = (resolve) => {
+          this.resolvers.add(resolve);
+          this.show();
+          // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+          closeOtherPagePopUp(this.closePopUp);
+        };
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    handleAgree(e) {
+      this.close();
+      // 这里演示了同时调用多个wx隐私接口时要如何处理：让隐私弹窗保持单例，点击一次同意按钮即可让所有pending中的wx隐私接口继续执行
+      this.resolvers.forEach((resolve) => {
+        resolve({
+          event: 'agree',
+          buttonId: 'agree-btn',
+        });
+      });
+      this.resolvers.clear();
+    },
+    handleDisagree() {
+      this.close();
+      this.resolvers.forEach((resolve) => {
+        resolve({
+          event: 'disagree',
+        });
+      });
+      this.resolvers.clear();
+    },
+    openPrivacyContract() {
+      return new Promise((resolve, reject) => {
+        if (wx.openPrivacyContract) {
+          wx.openPrivacyContract({
+            success: resolve,
+            fail: reject,
+          });
+        } else {
+          reject(new Error('wx.openPrivacyContract is not a function'));
+        }
+      }).catch((e) => {
+        // wx.previewImage({
+        //   urls: ['https://img-operation.csdnimg.cn/csdn/silkroad/img/1693902370785.jpg']
+        // })
+      });
+    },
+    close() {
+      if (this.data.visible) {
+        this.setData({
+          visible: false,
+        });
+      }
+    },
+    show() {
+      if (this.data.visible === false) {
+        this.setData({
+          visible: true,
+        });
+      }
+    },
+  },
+});

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

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "styleIsolation": "shared",
+  "usingComponents": {
+    "modal": "/materials/gsd-h5-react/components/wd-modal/index",
+    "text": "/materials/gsd-h5-react/components/wd-text/index",
+    "icon": "/materials/gsd-h5-react/components/wd-icon/index",
+    "wd-button": "/materials/gsd-h5-react/components/wd-button/index"
+  }
+}

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

@@ -0,0 +1,11 @@
+<modal defaultShow="{{visible}}" closeType="{{[]}}">
+  <text level="title-6" text="{{title}}" slot="headerSlot">{{title}}</text>
+  <icon style="color: rgba(0, 0, 0, 0.6);" name="td:close" size="md" bind:tap="handleDisagree" slot="headerSlot"/>
+
+  <text style="display:inline;" level="body-default" text="{{desc1}}" slot="contentSlot" />
+  <text style="display:inline;color: var(--wd-color-brand)" level="body-default" text="{{urlTitle}}" slot="contentSlot" bindtap="openPrivacyContract" />
+  <text style="display:inline;" level="body-default" text="{{desc2}}" slot="contentSlot" />
+
+  <wd-button text="取消" slot="footerSlot" theme="secondary" variant="outline" size="md" bindtap="handleDisagree"/>
+  <button class="wd-btn wd-btn--primary wd-btn--base wd-btn--md wd-mp-btn" id="agree-btn" theme="primary" variant="base" size="md" open-type="agreePrivacyAuthorization" bindtap="close" bindagreeprivacyauthorization="handleAgree" slot="footerSlot">同意</button>
+</modal>

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

@@ -0,0 +1,5 @@
+/* common/privacyModel/index.wxss */
+.weda-modal-new {
+  padding: 32rpx 24rpx 24rpx 24rpx;
+  padding-bottom: 24rpx !important;
+}

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

@@ -100,7 +100,7 @@ export function createPage({
       ...createInitData(widgetProps, dataBinds),
       _isCheckingAtuh: false,
       _expiredMessage: '',
-      weDaHasLogin: false,
+      weDaHasLogin: null,
     },
     lifetimes: {
       attached() {
@@ -172,6 +172,10 @@ export function createPage({
                   weDaHasLogin: true,
                 });
                 createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
+              }else {
+                this.setData({
+                  weDaHasLogin: false,
+                });
               }
             } finally {
               this.setData({ _isCheckingAtuh: false });

package/template/mp/package.json

@@ -6,7 +6,7 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.9",
+    "@cloudbase/weda-client": "1.0.10",
     "@cloudbase/weda-cloud-sdk": "1.0.45",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",