@cloudbase/framework-plugin-low-code 0.6.59-alpha.0 → 0.6.61

package/README.md

@@ -102,3 +102,24 @@ cloudbase framework:deploy
 - 云开发官网地址： [https://cloudbase.net/](https://cloudbase.net/)
 - 云开发静态网站开通指南：[https://docs.cloudbase.net/hosting/](https://docs.cloudbase.net/hosting/)
 - 云开发控制台地址： [https://console.cloud.tencent.com/tcb](https://console.cloud.tencent.com/tcb)
+
+## 本地测试
+
+1. 需要先 link framework。简单可以 clone http://git.code.oa.com/QBase/cloudbase-framework-plugin-low-code.git，切换 release/cals_v2 分支，执行命令，完成 framework-core 的 link；
+
+   ```bash
+   yarn
+   yarn run bootstrap
+   yarn run build
+   yarn run link
+
+   ```
+
+1. link low-code-plugin。在本目录执行命令，完成 framework 的 link
+   ```
+   yarn
+   yarn run build
+   yarn run link
+   ```
+1. 本地开发 通过 `yarn run dev` 监听文件变化并 ts 编译。
+1. `__test__/sample` 目录中有测试项目，通过添加 `.env` 文件可指定 mpAppId /ENV_ID 以及 SECRET 等环境变量。`input.json` 为低码配置，`yarn run dev` 进行文件生成及发布。

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

@@ -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,iBAsGf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
+{"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,iBAyGf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}

package/lib/builder/core/generate.js

@@ -67,6 +67,8 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                 domain: domain,
                 appConfig: util_1.JsonToStringWithVariableName({
                     id: appKey,
+                    staticResourceDomain: domain || '',
+                    envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
                     pages: pageInstanceList
                         .sort((item) => (item.isHome ? -1 : 1))
                         .map((item) => ({

package/lib/builder/mp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAuSvC;AA4KD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAuSvC;AA8KD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}

package/lib/builder/mp/index.js

@@ -328,6 +328,8 @@ function generateFramework(appData, outDir, ctx) {
                         isBare: false,
                         appConfig: util_3.JsonToStringWithVariableName({
                             id: ctx.appId,
+                            staticResourceDomain: ctx.domain || '',
+                            envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                             pages: appData.pageInstanceList
                                 .sort((item) => (item.isHome ? -1 : 1))
                                 .map((item) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.59-alpha.0",
+  "version": "0.6.61",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -87,4 +87,4 @@
     "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
-}
+}

package/template/html/index.html.ejs

@@ -459,20 +459,10 @@
       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>
-      (function () {
-        const _isPrivate = window._isPrivate || false;
-        if (_isPrivate === true) {
-          document.write(
-            `<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.7/dist/h5.browser.js?v=1"><\/script>`
-          );
-        } else {
-          document.write(
-            `<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"><\/script>`
-          );
-        }
-      })();
-    </script>
+    <script
+      crossorigin="anonymous"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"
+    ></script>
     <script>
       // zxing polifill
       if (!this.globalThis) {

package/template/mp/common/util.js

@@ -51,7 +51,7 @@ export function createEventHandlers(evtListeners, context) {
             detail: res
           })
         } catch (e) {
-          let eventName = l.key ? `${l.key}_fail` : ''
+          let eventName = l.key ? `${prefix}$${l.key}_fail` : ''
           if(self[eventName]){
             await self[eventName]({
               ...event,

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

@@ -1,10 +1,5 @@
 import * as React from 'react';
-import {
-  useContext,
-  useCallback,
-  createContext,
-  useRef
-} from 'react';
+import { useContext, useCallback, createContext, useRef } from 'react';
 import { observer } from 'mobx-react-lite';
 import { emitEvent } from '../actionHandler/utils';
 import { translateStyleToRem } from '@tcwd/weapps-core';
@@ -12,15 +7,40 @@ import { get, set } from 'lodash';
 import { $page } from '../../app/global-api';
 import { getDom } from '../utils/widgets';
 import { checkVisible } from '../../utils/index';
+import { generateSlotMetaMap } from '../render';
 
 export const ForContext = createContext({});
 
+function generateSlotMap(slots, forContext = undefined) {
+  let map = {};
+  Object.keys(slots).forEach((slotProp) => {
+    let meta = slots[slotProp];
+    if (meta.type === 'HOC') {
+      set(map, slotProp, meta.node);
+    } else {
+      const Element = meta.node;
+      if (forContext) {
+        set(
+          map,
+          slotProp,
+          <ForContext.Provider value={forContext}>
+            <Element />
+          </ForContext.Provider>
+        );
+      } else {
+        set(map, slotProp, <Element />);
+      }
+    }
+  });
+  return map;
+}
+
 export const CompRenderer = observer(function (props) {
   const {
     id: compId,
     xProps,
     virtualFields,
-    slots = {},
+    renderSlot,
     codeContext,
     scopeContext,
     context = {},
@@ -56,6 +76,13 @@ export const CompRenderer = observer(function (props) {
   const Field = virtualFields[sourceKey];
   const parentForItems = useContext(ForContext);
 
+  const _context = {
+    scopeContext,
+    forContext: parentForItems,
+    codeContext,
+    dataContext: context,
+  };
+
   // 组件最终用于执行的事件函数
   const emit = useCallback(
     (trigger, eventDetail, forItems, scopeContext) => {
@@ -187,10 +214,22 @@ export const CompRenderer = observer(function (props) {
       if (!checkVisible(forItemData)) {
         return null;
       }
-      // 多个组件的 slot 属性
-      Object.keys(slots).forEach((slotProp) => {
-        set(forItemData, slotProp, slots[slotProp]);
-      });
+
+      const slotMap = generateSlotMap(
+        generateSlotMetaMap(
+          componentSchema,
+          {
+            ..._context,
+            forContext: forItems,
+            virtualFields,
+            updateContext,
+          },
+          {
+            renderSlot,
+          }
+        )
+      );
+
       const emitWithForItems = (trigger, evt) =>
         emit(trigger, evt, forItems, scopeContext);
 
@@ -230,6 +269,7 @@ export const CompRenderer = observer(function (props) {
           <Field
             data={{
               ...forItemData,
+              ...slotMap,
               _selectableBlockEvents: _selectableBlockEventsForItems,
             }}
             id={compId}
@@ -270,9 +310,19 @@ export const CompRenderer = observer(function (props) {
   }
 
   // 单个组件的 slot 属性
-  Object.keys(slots).forEach((slotProp) => {
-    set(fieldData, slotProp, slots[slotProp]);
-  });
+  const slotMap = generateSlotMap(
+    generateSlotMetaMap(
+      componentSchema,
+      {
+        ..._context,
+        virtualFields,
+        updateContext,
+      },
+      {
+        renderSlot,
+      }
+    )
+  );
 
   // 防止渲染时 data 的 style 与实际的 style 冲突
   delete fieldData.style;
@@ -304,6 +354,7 @@ export const CompRenderer = observer(function (props) {
     <Field
       data={{
         ...fieldData,
+        ...slotMap,
         _selectableBlockEvents: _selectableBlockEventsWithItem,
       }}
       id={compId}

package/template/src/handlers/render.jsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useRef } from 'react';
 import * as _ from 'lodash';
-import { CompRenderer } from './FieldMiddleware/renderer';
+import { CompRenderer, ForContext } from './FieldMiddleware/renderer';
 import { isScopeSlot } from '../utils/index';
 
 function getComponentChildren(component) {
@@ -14,6 +14,68 @@ function getComponentChildren(component) {
   );
 }
 
+export function generateSlotMetaMap(componentSchema, context, options = {}) {
+  const slots = {};
+  const { properties = {} } = componentSchema;
+  const {
+    scopeContext,
+    codeContext,
+    virtualFields,
+    dataContext,
+    updateContext,
+    forContext,
+  } = context;
+  // eslint-disable-next-line guard-for-in
+  for (const key in properties) {
+    const child = properties[key];
+    if (!child['x-props'] && child.properties) {
+      const isHOC = isScopeSlot(componentSchema, key);
+
+      slots[key] = {
+        type: isHOC ? 'HOC' : 'ELEMENT',
+        node: isHOC
+          ? (props) => {
+              let clonedScopeContext = _.cloneDeep(scopeContext);
+              _.set(
+                clonedScopeContext,
+                `${componentSchema.key}.${child.key}`,
+                props
+              );
+              return (
+                <AppRender
+                  key={child.key}
+                  componentSchema={child}
+                  renderSlot={options?.renderSlot}
+                  virtualFields={virtualFields}
+                  codeContext={codeContext}
+                  scopeContext={clonedScopeContext}
+                  context={dataContext}
+                  updateContext={updateContext}
+                />
+              );
+            }
+          : () => {
+              return (
+                <ForContext.Provider value={forContext}>
+                  <AppRender
+                    key={child.key}
+                    componentSchema={child}
+                    renderSlot={options?.renderSlot}
+                    virtualFields={virtualFields}
+                    codeContext={codeContext}
+                    scopeContext={scopeContext}
+                    context={dataContext}
+                    updateContext={updateContext}
+                  />
+                </ForContext.Provider>
+              );
+            },
+      };
+    }
+  }
+  return slots;
+}
+
 export function AppRender(props) {
   const {
     className,
@@ -70,46 +132,6 @@ export function AppRender(props) {
   }
 
   const children = getComponentChildren(componentSchema);
-  const slots = {};
-  // eslint-disable-next-line guard-for-in
-  for (const key in properties) {
-    const child = properties[key];
-    if (!child['x-props'] && child.properties) {
-      slots[key] = isScopeSlot(componentSchema, key) ? (
-        (props) => {
-          let clonedScopeContext = _.cloneDeep(scopeContext);
-          _.set(
-            clonedScopeContext,
-            `${componentSchema.key}.${child.key}`,
-            props
-          );
-          return (
-            <AppRender
-              key={child.key}
-              componentSchema={child}
-              renderSlot
-              virtualFields={virtualFields}
-              codeContext={codeContext}
-              scopeContext={clonedScopeContext}
-              context={context}
-              updateContext={updateContext}
-            />
-          );
-        }
-      ) : (
-        <AppRender
-          key={child.key}
-          componentSchema={child}
-          renderSlot
-          virtualFields={virtualFields}
-          codeContext={codeContext}
-          scopeContext={scopeContext}
-          context={context}
-          updateContext={updateContext}
-        />
-      );
-    }
-  }
 
   return (
     <CompRenderer
@@ -118,7 +140,7 @@ export function AppRender(props) {
       emitEvents={componentSchema.emitEvents || []}
       componentSchema={componentSchema}
       virtualFields={virtualFields}
-      slots={slots}
+      renderSlot={renderSlot}
       codeContext={codeContext}
       scopeContext={scopeContext}
       context={context}