@cloudbase/framework-plugin-low-code 0.7.35 → 0.7.36

package/lib/config/private.d.ts

@@ -0,0 +1,3 @@
+export declare const PRIVATE_JS_NAME = "weda-private.js";
+export declare const PRIVATE_JS_CODE = "\n /**\n  * An empty js file. It will be overridden in private place.\n  *\n  * For example:\n  * ```javascript\n  * window._isPrivate = true\n  * ```\n  */\n ";
+//# sourceMappingURL=private.d.ts.map

package/lib/config/private.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"private.d.ts","sourceRoot":"","sources":["../../src/config/private.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,oBAAoB,CAAC;AAKjD,eAAO,MAAM,eAAe,oKAS1B,CAAC"}

package/lib/config/private.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PRIVATE_JS_CODE = exports.PRIVATE_JS_NAME = void 0;
+exports.PRIVATE_JS_NAME = 'weda-private.js';
+exports.PRIVATE_JS_CODE = `
+ /**
+  * An empty js file. It will be overridden in private place.
+  *
+  * For example:
+  * \`\`\`javascript
+  * window._isPrivate = true
+  * \`\`\`
+  */
+ `;

package/lib/weapps-core/utils/file.d.ts

@@ -6,7 +6,7 @@ export declare function originJsonToFileList(appData: IWeAppData): (import("../t
     code: string;
     pageId: string;
 })[];
-export declare function getExtByType(type: CodeType): ".less" | ".js" | ".json";
+export declare function getExtByType(type: CodeType): ".js" | ".json" | ".less";
 export declare function HACK_FIX_LOWCODE_IN(code?: string): string;
 export declare function HACK_FIX_LOWCODE_OUT(code?: string): string;
 //# sourceMappingURL=file.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.35",
+  "version": "0.7.36",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -35,7 +35,7 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "0.3.34",
+    "@cloudbase/cals": "0.3.35",
     "@cloudbase/framework-core": "^1.8.16",
     "@cloudbase/framework-plugin-auth": "^1.8.16",
     "@cloudbase/framework-plugin-mp": "v1.3.6-beta.8",
@@ -87,4 +87,4 @@
     "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
-}
+}

package/template/mp/common/util.js

@@ -283,7 +283,6 @@ async function getAccessPermission(app, appId, pageId) {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
-  return true;
   const loginPage = findLoginPage(app);
   if (loginPage?.id === $page.id) {
     return true

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -159,16 +159,44 @@ function FieldWrapper({
   context,
   children,
   updateContext,
+  renderSlot = false,
 }) {
-  const { scopeContext, forContext, forIndexes, widgetsData, codeContext, dataContext } = context;
+  const { scopeContext, forContext, forIndexes, widgetsData, codeContext, dataContext, virtualFields } = context;
 
   const injectContext = {};
   const indexRef = React.useRef();
   const typeRef = React.useRef();
   const instanceRef = React.useRef();
+
   const { 'x-props': xProps } = componentSchema;
   let { staticResourceAttribute = [], listenerInstances = [] } = xProps;
 
+  // 多个组件的 slot 属性
+  const slotMap = React.useMemo(
+    () => {
+      return generateSlotMap(
+        generateSlotMetaMap(
+          componentSchema,
+          {
+            scopeContext,
+            forContext,
+            dataContext,
+            codeContext,
+            virtualFields,
+            updateContext,
+            injectContext,
+          },
+          {
+            renderSlot,
+          },
+        ),
+      );
+    },
+    !!codeContext
+      ? [componentSchema, virtualFields]
+      : [componentSchema, scopeContext, codeContext, forContext, dataContext, virtualFields],
+  );
+
   // 组件最终用于执行的事件函数
   const emit = React.useCallback(
     (trigger, listeners, eventData, forItems, domEvent, scopeContext) => {
@@ -245,6 +273,7 @@ function FieldWrapper({
       ref={instanceRef}
       data={{
         ...data,
+        ...slotMap,
         _selectableBlockEvents: {
           onCustomEvent: ({ order: index, blockKey }) => {
             if (index !== undefined) {
@@ -363,21 +392,6 @@ export function getComponentRenderList(props) {
           return null;
         }
 
-        const slotMap = generateSlotMap(
-          generateSlotMetaMap(
-            componentSchema,
-            {
-              ..._context,
-              forContext: forItems,
-              virtualFields,
-              updateContext,
-            },
-            {
-              renderSlot,
-            },
-          ),
-        );
-
         return (
           <ForContext.Provider key={forItemData._key} value={forItems}>
             <FieldWrapper
@@ -388,13 +402,11 @@ export function getComponentRenderList(props) {
                 widgetsData,
                 forContext: forItems,
                 forIndexes: forItemsIndexes,
+                virtualFields,
               }}
               id={compId}
               updateContext={updateContext}
-              data={{
-                ...forItemData,
-                ...slotMap,
-              }}
+              data={forItemData}
               {...getSafeComponentProps({
                 style: forItemStyle,
                 classNameList: forItemClassNameList,
@@ -433,21 +445,6 @@ export function getComponentRenderList(props) {
     return null;
   }
 
-  // 单个组件的 slot 属性
-  const slotMap = generateSlotMap(
-    generateSlotMetaMap(
-      componentSchema,
-      {
-        ..._context,
-        virtualFields,
-        updateContext,
-      },
-      {
-        renderSlot,
-      },
-    ),
-  );
-
   return (
     <FieldWrapper
       key={key}
@@ -457,13 +454,11 @@ export function getComponentRenderList(props) {
         ..._context,
         forIndexes: forIndexes,
         widgetsData,
+        virtualFields,
       }}
       id={compId}
       updateContext={updateContext}
-      data={{
-        ...fieldData,
-        ...slotMap,
-      }}
+      data={fieldData}
       {...getSafeComponentProps({
         style: finalStyle,
         classNameList: finalClassNameList,

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

@@ -218,6 +218,7 @@ export async function checkAnonymous() {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
+  return true
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
     app.showNavigationBarLoading();
   const { loginConfigVersion } = app.__internal__.getConfig();