npm - @cloudbase/framework-plugin-low-code - Versions diffs - 0.7.9 → 0.7.10-beta.2 - Mend

@cloudbase/framework-plugin-low-code 0.7.9 → 0.7.10-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/lib/builder/core/generate.d.ts.map +1 -1
package/lib/builder/core/generate.js +2 -0
package/lib/weapps-core/utils/style.js +0 -8
package/package.json +1 -1
package/template/html/index.html.ejs +420 -428
package/template/package.json +1 -2
package/template/src/handlers/utils/common.js +36 -24
package/template/src/index.jsx +5 -8
package/template/webpack/web.prod.js +1 -1

package/lib/builder/core/generate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,~~iBA6Gf~~;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
1	+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA8Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}

package/lib/builder/core/generate.js CHANGED Viewed

@@ -53,6 +53,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
             }
         });
         yield Promise.all(allAppDataList.map((data) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { pageInstanceList, rootPath = '' } = data;
             const appName = rootPath ? 'Sub app ' + rootPath : 'Main app';
             console.log(chalk_1.default.blue.bold('Generating files for ' + appName));
@@ -68,6 +69,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                 appConfig: (0, util_1.JsonToStringWithVariableName)({
                     id: appKey,
                     envId: appData.envId,
+                    clientId: (_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
                     staticResourceDomain: domain || '',
                     envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
                     pages: pageInstanceList

package/lib/weapps-core/utils/style.js CHANGED Viewed

@@ -214,14 +214,7 @@ function translateStyleByHandler(style = {}, handler) {
             setStyleValue(result, key, value);
         }
         else if (value !== undefined && value !== null) {
-          try {
             setStyleValue(result, key, handler(value));
-          }catch(e){
-            console.log(style,key,value)
-            console.log(e)
-            throw e
-          }
         }
         return result;
     }, {});
@@ -264,7 +257,6 @@ function toREM(cssLen) {
         return calPxToREM(cssLen);
     }
     else {
-        console.log(cssLen)
         throw new Error('cssLen type error');
     }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.9",
+  "version": "0.7.10-beta.2",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs CHANGED Viewed

@@ -1,21 +1,16 @@
 <!DOCTYPE html>
 <html lang="zh-cn">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=9" />
-    <meta name="renderer" content="webkit|ie-stand" />
-    <meta
-      name="viewport"
-      content="width=device-width,initial-scale=1.0,user-scalable=no,viewport-fit=cover"
-    />
-    <meta name="format-detection" content="telephone=no" />
-    <meta name="description" content="<%= meta.desc %>" />
-    <script
-      crossorigin="anonymous"
-      src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js?v=1"
-    ></script>
-    <script>
-      <% if(!isAdminPortal){ %>
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=9" />
+  <meta name="renderer" content="webkit|ie-stand" />
+  <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no,viewport-fit=cover" />
+  <meta name="format-detection" content="telephone=no" />
+  <meta name="description" content="<%= meta.desc %>" />
+  <script crossorigin="anonymous" src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
+  <script>
+      <% if (!isAdminPortal) { %>
       const _aegis = new Aegis({
         id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
         reportApiSpeed: true, // 接口测速
@@ -33,374 +28,395 @@
       });
       <% }%>
       window._aegis = _aegis;
-      window._aegis_inited = Date.now()
-    </script>
-    <title><%= meta.title %></title>
-    <% if(delevopment){ %>
+    window._aegis_inited = Date.now()
+  </script>
+  <title>
+    <%= meta.title %>
+  </title>
+  <% if(delevopment){ %>
     <!-- <script src="https://cdn.jsdelivr.net/npm/eruda"></script>
     <script>
       eruda.init();
     </script> -->
-    <% }%> <% Array.isArray(meta.jsApis) &&
-    meta.jsApis.filter(function(item){return !!item}).forEach(function(jsApi){%>
-    <script src="<%=jsApi %>"></script>
-    <% })%>
-    <!-- 重置浏览器样式 -->
-    <style type="text/css">
-      .clearfix::before,
-      .clearfix::after {
-        content: '';
-        display: table;
-      }
-      .clearfix::after {
-        clear: both;
-      }
-      html {
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%;
-        -webkit-tap-highlight-color: transparent;
-        height: 100%;
-      }
-      body {
-        margin: 0;
-        font-size: 14px;
-        font-family: 'Helvetica Neue', Helvetica, 'Microsoft Yahei', STHeiTi,
-          Arial, sans-serif;
-        line-height: 1.5;
-        color: #333;
-        background-color: #fff;
-        min-height: 100%;
-      }
-      body > #react-body {
-        height: 100%;
-      }
-      .weapps-page {
-        min-height: 100%;
-      }
-      article,
-      aside,
-      details,
-      figcaption,
-      figure,
-      footer,
-      header,
-      hgroup,
-      main,
-      menu,
-      nav,
-      section,
-      summary {
-        display: block;
-      }
-      audio,
-      canvas,
-      progress,
-      video {
-        display: inline-block;
-      }
-      audio:not([controls]) {
-        display: none;
-        height: 0;
-      }
-      progress {
-        vertical-align: baseline;
-      }
-      [hidden],
-      template {
-        display: none;
-      }
-      a {
-        background: transparent;
-        text-decoration: none;
-        color: #08c;
-      }
-      a:active {
-        outline: 0;
-      }
-      abbr[title] {
-        border-bottom: 1px dotted;
-      }
-      b,
-      strong {
-        font-weight: bold;
-      }
-      dfn {
-        font-style: italic;
-      }
-      mark {
-        background: #ff0;
-        color: #000;
-      }
-      small {
-        font-size: 80%;
-      }
-      sub,
-      sup {
-        font-size: 75%;
-        line-height: 0;
-        position: relative;
-        vertical-align: baseline;
-      }
-      sup {
-        top: -0.5em;
-      }
-      sub {
-        bottom: -0.25em;
-      }
-      img {
-        border: 0;
-        vertical-align: middle;
-      }
-      svg:not(:root) {
-        overflow: hidden;
-      }
-      pre {
-        overflow: auto;
-        white-space: pre;
-        white-space: pre-wrap;
-        word-wrap: break-word;
-      }
-      code,
-      kbd,
-      pre,
-      samp {
-        font-family: monospace, monospace;
-        font-size: 1em;
-      }
-      button,
-      input,
-      optgroup,
-      select,
-      textarea {
-        color: inherit;
-        font: inherit;
-        margin: 0;
-        vertical-align: middle;
-      }
-      button,
-      input,
-      select {
-        overflow: visible;
-      }
-      button,
-      select {
-        text-transform: none;
-      }
-      button,
-      html input[type='button'],
-      input[type='reset'],
-      input[type='submit'] {
-        -webkit-appearance: button;
-        cursor: pointer;
-      }
-      [disabled] {
-        cursor: default;
-      }
-      button::-moz-focus-inner,
-      input::-moz-focus-inner {
-        border: 0;
-        padding: 0;
-      }
-      input {
-        line-height: normal;
-      }
-      input[type='checkbox'],
-      input[type='radio'] {
-        box-sizing: border-box;
-        padding: 0;
-      }
-      input[type='number']::-webkit-inner-spin-button,
-      input[type='number']::-webkit-outer-spin-button {
-        height: auto;
-      }
-      input[type='search'] {
-        -webkit-appearance: textfield;
-        box-sizing: border-box;
-      }
-      input[type='search']::-webkit-search-cancel-button,
-      input[type='search']::-webkit-search-decoration {
-        -webkit-appearance: none;
-      }
-      fieldset {
-        border: 1px solid #c0c0c0;
-        margin: 0 2px;
-        padding: 0.35em 0.625em 0.75em;
-      }
-      legend {
-        border: 0;
-        padding: 0;
-      }
-      textarea {
-        overflow: auto;
-        resize: vertical;
-        vertical-align: top;
-      }
-      optgroup {
-        font-weight: bold;
-      }
-      input,
-      select,
-      textarea {
-        outline: 0;
-      }
-      textarea,
-      input {
-        -webkit-user-modify: read-write-plaintext-only;
-      }
-      input::-ms-clear,
-      input::-ms-reveal {
-        display: none;
-      }
-      input::-moz-placeholder,
-      textarea::-moz-placeholder {
-        color: #999;
-      }
-      input:-ms-input-placeholder,
-      textarea:-ms-input-placeholder {
-        color: #999;
-      }
-      input::-webkit-input-placeholder,
-      textarea::-webkit-input-placeholder {
-        color: #999;
-      }
-      .placeholder {
-        color: #999;
-      }
-      table {
-        border-collapse: collapse;
-        border-spacing: 0;
-      }
-      td,
-      th {
-        padding: 0;
-      }
-      h1,
-      h2,
-      h3,
-      h4,
-      h5,
-      h6,
-      p,
-      figure,
-      form,
-      blockquote {
-        margin: 0;
-      }
-      ul,
-      ol,
-      li,
-      dl,
-      dd {
-        margin: 0;
-        padding: 0;
-      }
-      ul,
-      ol {
-        list-style: none outside none;
-      }
-      h1,
-      h2,
-      h3 {
-        line-height: 2;
-        font-weight: normal;
-      }
-      h1 {
-        font-size: 18px;
-      }
-      h2 {
-        font-size: 16px;
-      }
-      h3 {
-        font-size: 14px;
-      }
-      i {
-        font-style: normal;
-      }
-      * {
-        box-sizing: border-box;
-      }
-      .hide {
-        display: none;
-      }
-    </style>
-  </head>
-  <body data-weui-theme="light">
-    <div id="react-body" class="main-wrap"></div>
-    <% if(!isAdminPortal){ %>
+    <% }%>
+      <% Array.isArray(meta.jsApis) && meta.jsApis.filter(function(item){return !!item}).forEach(function(jsApi){%>
+        <script src="<%=jsApi %>"></script>
+        <% })%>
+          <!-- 重置浏览器样式 -->
+          <style type="text/css">
+            .clearfix::before,
+            .clearfix::after {
+              content: '';
+              display: table;
+            }
+            .clearfix::after {
+              clear: both;
+            }
+            html {
+              -ms-text-size-adjust: 100%;
+              -webkit-text-size-adjust: 100%;
+              -webkit-tap-highlight-color: transparent;
+              height: 100%;
+            }
+            body {
+              margin: 0;
+              font-size: 14px;
+              font-family: 'Helvetica Neue', Helvetica, 'Microsoft Yahei', STHeiTi,
+                Arial, sans-serif;
+              line-height: 1.5;
+              color: #333;
+              background-color: #fff;
+              min-height: 100%;
+            }
+            body>#react-body {
+              height: 100%;
+            }
+            .weapps-page {
+              min-height: 100%;
+            }
+            article,
+            aside,
+            details,
+            figcaption,
+            figure,
+            footer,
+            header,
+            hgroup,
+            main,
+            menu,
+            nav,
+            section,
+            summary {
+              display: block;
+            }
+            audio,
+            canvas,
+            progress,
+            video {
+              display: inline-block;
+            }
+            audio:not([controls]) {
+              display: none;
+              height: 0;
+            }
+            progress {
+              vertical-align: baseline;
+            }
+            [hidden],
+            template {
+              display: none;
+            }
+            a {
+              background: transparent;
+              text-decoration: none;
+              color: #08c;
+            }
+            a:active {
+              outline: 0;
+            }
+            abbr[title] {
+              border-bottom: 1px dotted;
+            }
+            b,
+            strong {
+              font-weight: bold;
+            }
+            dfn {
+              font-style: italic;
+            }
+            mark {
+              background: #ff0;
+              color: #000;
+            }
+            small {
+              font-size: 80%;
+            }
+            sub,
+            sup {
+              font-size: 75%;
+              line-height: 0;
+              position: relative;
+              vertical-align: baseline;
+            }
+            sup {
+              top: -0.5em;
+            }
+            sub {
+              bottom: -0.25em;
+            }
+            img {
+              border: 0;
+              vertical-align: middle;
+            }
+            svg:not(:root) {
+              overflow: hidden;
+            }
+            pre {
+              overflow: auto;
+              white-space: pre;
+              white-space: pre-wrap;
+              word-wrap: break-word;
+            }
+            code,
+            kbd,
+            pre,
+            samp {
+              font-family: monospace, monospace;
+              font-size: 1em;
+            }
+            button,
+            input,
+            optgroup,
+            select,
+            textarea {
+              color: inherit;
+              font: inherit;
+              margin: 0;
+              vertical-align: middle;
+            }
+            button,
+            input,
+            select {
+              overflow: visible;
+            }
+            button,
+            select {
+              text-transform: none;
+            }
+            button,
+            html input[type='button'],
+            input[type='reset'],
+            input[type='submit'] {
+              -webkit-appearance: button;
+              cursor: pointer;
+            }
+            [disabled] {
+              cursor: default;
+            }
+            button::-moz-focus-inner,
+            input::-moz-focus-inner {
+              border: 0;
+              padding: 0;
+            }
+            input {
+              line-height: normal;
+            }
+            input[type='checkbox'],
+            input[type='radio'] {
+              box-sizing: border-box;
+              padding: 0;
+            }
+            input[type='number']::-webkit-inner-spin-button,
+            input[type='number']::-webkit-outer-spin-button {
+              height: auto;
+            }
+            input[type='search'] {
+              -webkit-appearance: textfield;
+              box-sizing: border-box;
+            }
+            input[type='search']::-webkit-search-cancel-button,
+            input[type='search']::-webkit-search-decoration {
+              -webkit-appearance: none;
+            }
+            fieldset {
+              border: 1px solid #c0c0c0;
+              margin: 0 2px;
+              padding: 0.35em 0.625em 0.75em;
+            }
+            legend {
+              border: 0;
+              padding: 0;
+            }
+            textarea {
+              overflow: auto;
+              resize: vertical;
+              vertical-align: top;
+            }
+            optgroup {
+              font-weight: bold;
+            }
+            input,
+            select,
+            textarea {
+              outline: 0;
+            }
+            textarea,
+            input {
+              -webkit-user-modify: read-write-plaintext-only;
+            }
+            input::-ms-clear,
+            input::-ms-reveal {
+              display: none;
+            }
+            input::-moz-placeholder,
+            textarea::-moz-placeholder {
+              color: #999;
+            }
+            input:-ms-input-placeholder,
+            textarea:-ms-input-placeholder {
+              color: #999;
+            }
+            input::-webkit-input-placeholder,
+            textarea::-webkit-input-placeholder {
+              color: #999;
+            }
+            .placeholder {
+              color: #999;
+            }
+            table {
+              border-collapse: collapse;
+              border-spacing: 0;
+            }
+            td,
+            th {
+              padding: 0;
+            }
+            h1,
+            h2,
+            h3,
+            h4,
+            h5,
+            h6,
+            p,
+            figure,
+            form,
+            blockquote {
+              margin: 0;
+            }
+            ul,
+            ol,
+            li,
+            dl,
+            dd {
+              margin: 0;
+              padding: 0;
+            }
+            ul,
+            ol {
+              list-style: none outside none;
+            }
+            h1,
+            h2,
+            h3 {
+              line-height: 2;
+              font-weight: normal;
+            }
+            h1 {
+              font-size: 18px;
+            }
+            h2 {
+              font-size: 16px;
+            }
+            h3 {
+              font-size: 14px;
+            }
+            i {
+              font-style: normal;
+            }
+            * {
+              box-sizing: border-box;
+            }
+            .hide {
+              display: none;
+            }
+          </style>
+</head>
+<body data-weui-theme="light">
+  <div id="react-body" class="main-wrap"></div>
+  <% if(!isAdminPortal){ %>
     <script src="/weda-config/weda-private.js"></script>
     <script src="//static.cloudbase.net/cloudbase-js-sdk/2.4.0-alpha.0/cloudbase.full.js?v=1"></script>
     <% }%>
-    <script>
-      if (window.cloudbase) {
-        const _callFunction = window.cloudbase.__proto__.callFunction;
-        window.cloudbase.__proto__.callFunction = function (args) {
-          let promise = _callFunction.call(window.cloudbase, ...arguments);
-          if (promise instanceof Promise) {
-            return promise
-              .then(function (res) {
-                const { name, data = {} } = args || {};
-                try {
-                  if (res.result && res.result.code) {
+      <script>
+        if (window.cloudbase) {
+          const _callFunction = window.cloudbase.__proto__.callFunction;
+          window.cloudbase.__proto__.callFunction = function (args) {
+            let promise = _callFunction.call(window.cloudbase, ...arguments);
+            if (promise instanceof Promise) {
+              return promise
+                .then(function (res) {
+                  const { name, data = {} } = args || {};
+                  try {
+                    if (res.result && res.result.code) {
+                      _aegis.report({
+                        msg:
+                          '[' +
+                          name +
+                          ':' +
+                          data.methodName +
+                          ']: ' +
+                          (res.result.message || '函数调用失败'),
+                        level: '16',
+                        ext2: res.result.code,
+                        ext3: res.requestId,
+                        trace: 'trace',
+                      });
+                    }
+                  } catch (e) { }
+                  return res;
+                })
+                .catch(function (e) {
+                  try {
                     _aegis.report({
                       msg:
                         '[' +
@@ -408,57 +424,33 @@
                         ':' +
                         data.methodName +
                         ']: ' +
-                        (res.result.message || '函数调用失败'),
+                        (e.message || '函数调用失败'),
                       level: '16',
-                      ext2: res.result.code,
-                      ext3: res.requestId,
+                      ext2: e.code,
+                      ext3: e.requestId,
                       trace: 'trace',
                     });
-                  }
-                } catch (e) {}
-                return res;
-              })
-              .catch(function (e) {
-                try {
-                  _aegis.report({
-                    msg:
-                      '[' +
-                      name +
-                      ':' +
-                      data.methodName +
-                      ']: ' +
-                      (e.message || '函数调用失败'),
-                    level: '16',
-                    ext2: e.code,
-                    ext3: e.requestId,
-                    trace: 'trace',
-                  });
-                } catch (e) {}
-                throw e;
-              });
-          } else {
-            return promise;
-          }
-        };
-      }
-    </script>
-    <script
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js?v=1"
-      crossorigin="anonymous"
-    ></script>
-    <script
-      crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.12/dist/h5.browser.js?v=1"
-    ></script>
-    <script>
-      // zxing polifill
-      if (!this.globalThis) {
-        this.globalThis = this;
-      }
-    </script>
-    <script
-      crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js?v=1"
-    ></script>
-  </body>
-</html>
+                  } catch (e) { }
+                  throw e;
+                });
+            } else {
+              return promise;
+            }
+          };
+        }
+      </script>
+      <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js?v=1"
+        crossorigin="anonymous"></script>
+      <script crossorigin="anonymous"
+        src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.10/dist/h5.browser.js?v=1"></script>
+      <script>
+        // zxing polifill
+        if (!this.globalThis) {
+          this.globalThis = this;
+        }
+      </script>
+      <script crossorigin="anonymous"
+        src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js?v=1"></script>
+</body>
+</html>

package/template/package.json CHANGED Viewed

@@ -6,11 +6,10 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.8",
+    "@cloudbase/weda-cloud-sdk": "1.0.10",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
-    "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",
     "mobx-react-lite": "^2.0.7",

package/template/src/handlers/utils/common.js CHANGED Viewed

@@ -218,29 +218,44 @@ export async function checkAnonymous() {
   return isAnonymous;
 }
+let loginConfig;
+export async function getLoginConfig() {
+  if (loginConfig !== undefined) {
+    return loginConfig;
+  }
+  const { staticResourceDomain, id } = app.__internal__.getConfig();
+  const url = `https://${staticResourceDomain}/${id}/login.config.json?t=${Date.now()}`;
+  try {
+    let response = await fetch(url);
+    loginConfig = await response.json();
+  } catch (e) {
+    loginConfig = {};
+    console.error(`加载登录配置${url}失败`, e);
+  }
+  return loginConfig;
+}
 /**
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
-  const loginPage = findLoginPage(app);
-  if (loginPage?.id === $page.id) {
-    return true
-  }
-  app.showNavigationBarLoading();
+    app.showNavigationBarLoading();
+  const loginConfig = await getLoginConfig();
   const requestList = [getAccessPermission(app, appId, $page.id)];
-  // 暂时先认为有登录页则自定义登录功能开启且生效
-  if (loginPage) {
+  // 登录配置内有web登录项则认为开启web登录
+  if (loginConfig.web?.length > 0) {
     requestList.push(getAuthConfig(app));
     requestList.push(checkAnonymous());
+    requestList.push(getLoginConfig()); // 提前并行加载
   }
   const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
-  if (loginPage && isAnonymous) {
+  if (loginConfig.web?.length > 0 && isAnonymous) {
     if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
-      return isAccess;
+      return false;
     }
   }
@@ -253,25 +268,22 @@ export async function checkAuth(app, appId, $page) {
   return isAccess;
 }
-export function redirectToLogin(currentPage) {
+export async function redirectToLogin(currentPage) {
   // 去登录则清空权限缓存。
   _AUTH_CACHE_MAP = {};
   const app = window.app;
-  const loginPage = findLoginPage(app);
-  if (!currentPage) {
-    currentPage = app.utils.getCurrentPage() || {};
-  }
-  if (loginPage?.id === currentPage.id) {
-    return true
-  }
-  if (loginPage) {
+  const loginConfig = await getLoginConfig();
+  if (loginConfig.web?.length > 0) {
+    const { staticResourceDomain, envId, id, clientId } = app.__internal__.getConfig();
+    const url = `${location.origin}/__auth/?redirect_uri=${encodeURIComponent(
+      location.href,
+    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}`;
     app.redirectTo({
-      pageId: loginPage.id,
-      params: {
-        sourcePageId: currentPage.id,
-        sourcePageParams: currentPage.dataset.params
-      }
-    })
+      mode: 'web',
+      params: {},
+      url,
+    });
   } else {
     app.showToast({
       title: '用户未登录',

package/template/src/index.jsx CHANGED Viewed

@@ -8,11 +8,10 @@ import './index.less'
 import './datasources'
 import { initGlobalVar } from './handlers/initWebEnv'
 import '@babel/polyfill/noConflict'
-import attachFastClick from 'fastclick'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './handlers/utils'
+import { redirectToLogin, getAuthConfig, checkAnonymous, getLoginConfig } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -26,8 +25,7 @@ setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginPage = findLoginPage();
+      const loginConfig = await getLoginConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -39,7 +37,7 @@ setConfig({
       }
       // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
       const { accessToken } = await getAccessToken();
@@ -60,8 +58,8 @@ setConfig({
   },
   async afterCallFunction(params, error, res) {
     if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
+      const loginConfig = await getLoginConfig();
+      if (loginConfig.web?.length > 0) {
         const authConfig = await getAuthConfig();
         const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
@@ -140,7 +138,6 @@ function render(props){
 // if (!process.env.isAdminPortal) {
 if (!window.__POWERED_BY_QIANKUN__) {
-  attachFastClick && attachFastClick.attach && attachFastClick.attach(document.body)
   render()
 }

package/template/webpack/web.prod.js CHANGED Viewed

@@ -270,7 +270,7 @@ module.exports = function (options) {
             priority: 100, // 优先级
           },
           utils: {
-            test: /(lodash|dayjs|axios|kbone-api|fastclick)/,
+            test: /(lodash|dayjs|axios|kbone-api)/,
             chunks: 'all',
             priority: 100, // 优先级
           },