@cloudbase/framework-plugin-low-code 0.5.17 → 0.5.21-alpha.0

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -231,9 +231,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
                 privateKeyPath: `./private.${deployOptions.mpAppId}.key`,
                 localPath: exports.DIST_PATH,
                 ignores: ['node_modules/**/*', LOG_FILE].concat(cloudfunctionRoot ? [path_1.default.join(cloudfunctionRoot, '**/*')] : []),
-                deployMode: deployOptions.mpAppId === deployOptions.targetMpAppId
-                    ? deployOptions.mode
-                    : types_1.DEPLOY_MODE.UPLOAD,
+                deployMode: deployOptions.mode,
                 uploadOptions: {
                     version: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.version) || '1.0.0',
                     desc: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.description) || '',

package/package.json

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

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

@@ -10,106 +10,7 @@ import { checkVisible } from '../../utils/index';
 
 export const ForContext = createContext({});
 
-export function getForList(dataBinds, parentForItems) {
-  // For循环渲染
-  let forList;
-  try {
-    // 绑定了 for 变量，但计算值错误时，应当空数组兜底
-    forList =
-      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems) || []);
-  } catch (e) {
-    // 计算值出错则使用空数组兜底
-    forList = [];
-    console.warn('_waFor data', e);
-  }
-  if (forList && !Array.isArray(forList)) {
-    console.warn(`${compId}循环绑定非数组值：`, forList);
-    forList = [];
-  }
-  return forList;
-}
-
-function getSafeComponentProps({
-  style,
-  classNameList,
-  staticResourceAttribute,
-}) {
-  const componentProps = {};
-  if (classNameList.length) {
-    componentProps.className = classNameList.join(' ');
-  }
-
-  if (style && Object.keys(style).length) {
-    componentProps.style = style;
-  }
-  if (staticResourceAttribute && staticResourceAttribute.length > 0) {
-    componentProps.staticResourceAttribute = staticResourceAttribute;
-  }
-  return componentProps;
-}
-
-// TODO: 需要不断移除 dataBinds(style/classList)
-function getBindData({
-  forItems,
-  scopeContext,
-  wData,
-  commonStyle,
-  isInComposite,
-  codeContext,
-  classNameList,
-}) {
-  // bindData
-  if (Array.isArray(wData)) {
-    wData =
-      forItems.forIndexes === void 0 || wData.length === 0
-        ? {}
-        : get(wData, getForIndexes(forItems, wData));
-  }
-  wData = wData || {};
-  const fieldData = { ...wData };
-
-  // 再次计算 scope value
-  for (let key in fieldData) {
-    if (Object.prototype.hasOwnProperty.call(fieldData, key)) {
-      const value = fieldData[key];
-      if (value && value.__type === 'scopedValue') {
-        try {
-          fieldData[key] = value.getValue(scopeContext);
-        } catch (e) {
-          console.warn(`Error computing data bind '${key}' error:`, e);
-          fieldData[key] = '';
-        }
-      }
-    }
-  }
-
-  // bindStyle
-  let bindStyle = fieldData.style || {};
-  // 复合组件第一层需要将最外层样式 style 挂到节点上
-  let cssStyle = commonStyle;
-  if (isInComposite && wData && !wData.parent) {
-    cssStyle = {
-      ...cssStyle,
-      ...(codeContext.$WEAPPS_COMP.props?.style || {}),
-    };
-    bindStyle = {
-      ...bindStyle,
-      ...(codeContext.$WEAPPS_COMP.props?.style || {}),
-    };
-  }
-  const finalStyle = getFinalStyle(cssStyle, bindStyle);
-
-  // bindClassList
-  const bindClassList = fieldData.classList || [];
-  const finalClassNameList = getFinalClassNameList(
-    classNameList,
-    bindClassList
-  );
-
-  return { fieldData, finalStyle, finalClassNameList };
-}
-
-export const getRenderList = function (props) {
+export const CompRenderer = observer(function (props) {
   const {
     id: compId,
     xProps,
@@ -126,7 +27,24 @@ export const getRenderList = function (props) {
     ? $page.widgets[compId]
     : codeContext.$WEAPPS_COMP.widgets[compId];
 
+  if (!xProps) {
+    return props.children;
+  }
+
+  const {
+    commonStyle = {},
+    sourceKey,
+    data = {},
+    dataBinds,
+    listenerInstances,
+    styleBind,
+    classNameList = [],
+    classNameListBind,
+    staticResourceAttribute = [],
+  } = xProps;
+  const Field = virtualFields[sourceKey];
   const parentForItems = useContext(ForContext);
+
   const emit = useCallback(
     (trigger, event, forItems, scopeContext) => {
       const listeners = listenerInstances;
@@ -149,23 +67,41 @@ export const getRenderList = function (props) {
     [props]
   );
 
-  if (!xProps) {
-    return props.children;
-  }
+  function getSafeComponentProps({
+    style,
+    classNameList,
+    staticResourceAttribute,
+  }) {
+    const componentProps = {};
+    if (classNameList.length) {
+      componentProps.className = classNameList.join(' ');
+    }
 
-  const {
-    commonStyle = {},
-    sourceKey,
-    dataBinds,
-    classNameList = [],
-    staticResourceAttribute = [],
-    listenerInstances,
-  } = xProps;
-  const Field = virtualFields[sourceKey];
+    if (style && Object.keys(style).length) {
+      componentProps.style = style;
+    }
+    if (staticResourceAttribute && staticResourceAttribute.length > 0) {
+      componentProps.staticResourceAttribute = staticResourceAttribute;
+    }
+    return componentProps;
+  }
 
   // For循环渲染
-  let forList = getForList(dataBinds, parentForItems);
+  let forList;
+  try {
+    // 绑定了 for 变量，但计算值错误时，应当空数组兜底
+    forList =
+      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems) || []);
+  } catch (e) {
+    // 计算值出错则使用空数组兜底
+    forList = [];
+    console.warn('_waFor data', e);
+  }
   if (forList) {
+    if (!Array.isArray(forList)) {
+      console.warn(`${compId}循环绑定非数组值：`, forList);
+      forList = [];
+    }
     return forList.map((item, index) => {
       const forItemsIndexes = (parentForItems.forIndexes || []).concat(index);
       const forItems = {
@@ -177,15 +113,7 @@ export const getRenderList = function (props) {
         fieldData: forItemData,
         finalStyle: forItemStyle,
         finalClassNameList: forItemClassNameList,
-      } = getBindData({
-        forItems,
-        scopeContext,
-        wData: widgetsData,
-        classNameList,
-        commonStyle,
-        isInComposite,
-        codeContext,
-      });
+      } = getBindData(forItems, scopeContext);
       if (!checkVisible(forItemData)) {
         return null;
       }
@@ -229,19 +157,16 @@ export const getRenderList = function (props) {
   }
 
   // 单节点渲染
-  const { fieldData, finalClassNameList, finalStyle } = getBindData({
+  const { fieldData, finalClassNameList, finalStyle } = getBindData(
     parentForItems,
-    scopeContext,
-    wData: widgetsData,
-    classNameList,
-    commonStyle,
-    isInComposite,
-    codeContext,
-  });
+    scopeContext
+  );
+  const emitWithForItems = (trigger, evt) =>
+    emit(trigger, evt, parentForItems, scopeContext);
 
   // false 或空字符串时
   if (!checkVisible(fieldData)) {
-    return [];
+    return null;
   }
 
   // 单个组件的 slot 属性
@@ -266,12 +191,12 @@ export const getRenderList = function (props) {
     classNameList: finalClassNameList,
     staticResourceAttribute,
   });
-  return [
+  return (
     <Field
       data={fieldData}
       id={compId}
       {...componentProps}
-      emit={(trigger, evt) => emit(trigger, evt, parentForItems, scopeContext)}
+      emit={emitWithForItems}
       events={emitEvents}
       compositeParent={codeContext}
       forIndexes={forIndexes}
@@ -279,12 +204,62 @@ export const getRenderList = function (props) {
       domRef={domRef}
     >
       {props.children}
-    </Field>,
-  ];
-};
+    </Field>
+  );
 
-export const CompRenderer = observer(function (props) {
-  return getRenderList(props);
+  // TODO: 需要不断移除 dataBinds(style/classList)
+  function getBindData(forItems, scopeContext) {
+    // bindData
+    let wData = widgetsData;
+    if (Array.isArray(wData)) {
+      wData =
+        forItems.forIndexes === void 0 || wData.length === 0
+          ? {}
+          : get(wData, getForIndexes(forItems, wData));
+    }
+    wData = wData || {};
+    const fieldData = { ...wData };
+
+    // 再次计算 scope value
+    for (let key in fieldData) {
+      if (Object.prototype.hasOwnProperty.call(fieldData, key)) {
+        const value = fieldData[key];
+        if (value && value.__type === 'scopedValue') {
+          try {
+            fieldData[key] = value.getValue(scopeContext);
+          } catch (e) {
+            console.warn(`Error computing data bind '${key}' error:`, e);
+            fieldData[key] = '';
+          }
+        }
+      }
+    }
+
+    // bindStyle
+    let bindStyle = fieldData.style || {};
+    // 复合组件第一层需要将最外层样式 style 挂到节点上
+    let cssStyle = commonStyle;
+    if (isInComposite && wData && !wData.parent) {
+      cssStyle = {
+        ...cssStyle,
+        ...(codeContext.$WEAPPS_COMP.props?.style || {}),
+      };
+      bindStyle = {
+        ...bindStyle,
+        ...(codeContext.$WEAPPS_COMP.props?.style || {}),
+      };
+    }
+    const finalStyle = getFinalStyle(cssStyle, bindStyle);
+
+    // bindClassList
+    const bindClassList = fieldData.classList || [];
+    const finalClassNameList = getFinalClassNameList(
+      classNameList,
+      bindClassList
+    );
+
+    return { fieldData, finalStyle, finalClassNameList };
+  }
 });
 
 export function getFinalStyle(

package/template/src/handlers/render.jsx

@@ -1,46 +1,20 @@
 import * as React from 'react';
 import { useRef } from 'react';
 import * as _ from 'lodash';
-import { getRenderList as getComponentRenderList } from './FieldMiddleware/renderer';
+import { CompRenderer } from './FieldMiddleware/renderer';
 import { isScopeSlot } from '../utils/index';
-import { observer } from 'mobx-react-lite';
 
-function checkDoNotRenderSlot(isSlot, renderSlot, rootNode) {
-  return isSlot && !(renderSlot || rootNode);
-}
-
-function getComponentChildren(
-  component,
-  { virtualFields, codeContext, scopeContext }
-) {
+function getComponentChildren(component) {
   const { properties } = component;
   if (!properties) {
     return [];
   }
-  let list = Object.values(properties).sort(
+  return Object.values(properties).sort(
     (a, b) => (a['x-index'] || 0) - (b['x-index'] || 0)
   );
-
-  const componentChildren = [];
-  const rootNode = false;
-  const renderSlot = false;
-  for (const schema of list) {
-    const children = getRenderList({
-      key: schema.key,
-      componentSchema: schema,
-      rootNode,
-      renderSlot,
-      virtualFields,
-      codeContext,
-      scopeContext,
-    });
-    componentChildren.push(children);
-  }
-
-  return componentChildren;
 }
 
-function getRenderList(props) {
+export function AppRender(props) {
   const {
     className,
     virtualFields,
@@ -50,11 +24,12 @@ function getRenderList(props) {
     codeContext,
     scopeContext = {},
   } = props;
+  
   const { 'x-props': xProps, properties = {} } = componentSchema;
 
   // 判断是否为 slot
   const isSlot = !xProps;
-  if (checkDoNotRenderSlot(isSlot, renderSlot, rootNode)) {
+  if (isSlot && !(renderSlot || rootNode)) {
     return null;
   }
 
@@ -92,6 +67,7 @@ function getRenderList(props) {
     }
   }
 
+  const children = getComponentChildren(componentSchema);
   const slots = {};
   // eslint-disable-next-line guard-for-in
   for (const key in properties) {
@@ -129,40 +105,27 @@ function getRenderList(props) {
     }
   }
 
-  // return (
-  //   <CompRenderer
-  //     id={componentSchema.key}
-  //     xProps={xProps}
-  //     emitEvents={componentSchema.emitEvents || []}
-  //     virtualFields={virtualFields}
-  //     slots={slots}
-  //     codeContext={codeContext}
-  //     scopeContext={scopeContext}
-  //   >
-  //     {getComponentChildren(componentSchema, {
-  //       virtualFields,
-  //       codeContext,
-  //       scopeContext,
-  //     })}
-  //   </CompRenderer>
-  // );
-
-  return getComponentRenderList({
-    id: componentSchema.key,
-    xProps,
-    emitEvents: componentSchema.emitEvents || [],
-    virtualFields,
-    slots,
-    codeContext,
-    scopeContext,
-    children: getComponentChildren(componentSchema, {
-      virtualFields,
-      codeContext,
-      scopeContext,
-    }),
-  });
+  return (
+    <CompRenderer
+      id={componentSchema.key}
+      xProps={xProps}
+      emitEvents={componentSchema.emitEvents || []}
+      virtualFields={virtualFields}
+      slots={slots}
+      codeContext={codeContext}
+      scopeContext={scopeContext}
+    >
+      {children.map((comp) => (
+        <AppRender
+          key={comp.key}
+          componentSchema={comp}
+          rootNode={false}
+          renderSlot={false}
+          virtualFields={virtualFields}
+          codeContext={codeContext}
+          scopeContext={scopeContext}
+        />
+      ))}
+    </CompRenderer>
+  );
 }
-
-export const AppRender = observer(function (props) {
-  return getRenderList(props);
-});

package/template/src/index.jsx

@@ -16,7 +16,6 @@ import { app } from './app/global-api'
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
 }
-attachFastClick && attachFastClick.attach && attachFastClick.attach(document.body)
 
 // 设置数据源请求的 loading 及 toast 处理
 setConfig({
@@ -87,14 +86,16 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 function render(props){
+  const target =  props && props.container ? props.container.querySelector('#react-body') : document.getElementById('react-body');
     ReactDOM.render(
       <App />,
-      props && props.container ? props.container.querySelector('#react-body') : document.getElementById('react-body')
+      target
     )
 }
 
 // if (!process.env.isAdminPortal) {
 if (!window.__POWERED_BY_QIANKUN__) {
+  attachFastClick && attachFastClick.attach && attachFastClick.attach(document.body)
   render()
 }