@cloudbase/framework-plugin-low-code 0.6.12 → 0.6.16

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,CAqSvC;AAkKD,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;AAkKD,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

@@ -100,9 +100,11 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
         let appFileData = {};
         if (weapps.find((item) => !item.mpPkgUrl)) {
             yield generateFramework(mainAppData, miniprogramRoot, buildContext);
-            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-            let appJsContent = yield fs.readFile(appJsPath);
-            yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+            if (mainAppData.mpPkgUrl) {
+                let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+                let appJsContent = yield fs.readFile(appJsPath);
+                yield generateFiles_1.writeFile(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+            }
             appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
                     domain: domain,
                 }, 'common/util.js': {

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

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

package/lib/builder/service/builder/generate.js

@@ -386,8 +386,8 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
     });
     return {
         widgets: util_1.JsonToStringWithVariableName(compWidgets),
-        dataBinds: util_1.JsonToStringWithVariableName(compDataBinds).replace(/\\r/g, '\n'),
-        componentSchema: util_1.JsonToStringWithVariableName(componentSchemaJson).replace(/\\r/g, '\n'),
+        dataBinds: util_1.JsonToStringWithVariableName(compDataBinds),
+        componentSchema: util_1.JsonToStringWithVariableName(componentSchemaJson),
     };
 }
 exports.getComponentSchemaString = getComponentSchemaString;
@@ -406,14 +406,14 @@ function generateDataBinds(dataBinds, isComposite) {
             funcCode = `() => ({__type: "scopedValue", getValue: ($scope)=>$scope.${bind.bindDataPath}})}`;
         }
         else if (bind.type === weapps_core_1.PropBindType.expression) {
-            let code = bind.bindDataPath.replace(/\n/g, ' ');
+            let code = bind.bindDataPath;
             if (isComposite) {
                 funcCode = `(forItems) => { const $for = forItems; return (${code.replace(/\$comp/g, 'this.$WEAPPS_COMP')})}`;
             }
             else {
                 funcCode = /\$scope\./.test(code)
-                    ? `(forItems, event) => ({__type: "scopedValue", getValue: ($scope) => { const $for = forItems;return (${code})}})`
-                    : `(forItems, event) => { const $for = forItems;return (${code})}`;
+                    ? `(forItems, event) => ({__type: "scopedValue", getValue: ($scope) => { const $for = forItems;return (\n${code}\n)}})`
+                    : `(forItems, event) => { const $for = forItems;return (\n${code}\n)}`;
             }
         }
         else if (bind.type === weapps_core_1.PropBindType.prop) {

package/lib/builder/util/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/builder/util/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,aAAa,EACd,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EACL,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAMrC,oBAAY,aAAa,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAClE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAQjE;AAOD,wBAAgB,qBAAqB;;;cAUpC;AAED,wBAAgB,kBAAkB,IAAI,YAAY,GAAG,SAAS,CAI7D;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAMlE;AAED,wBAAgB,eAAe,CAAC,MAAM,KAAA,OAIrC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,QAI9C;AAED,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,kBAAkB,GACpC,oBAAoB,CA2BtB;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,aAAa,EAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAuD7B;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,GAAG;;;;GA2BrD;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,iBAgChB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE;QACV,CAAC,aAAa,EAAE,MAAM,GAAG;YACvB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,GAAG,IAAI,CA0BP;AAOD,wBAAgB,sBAAsB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAK7D"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/builder/util/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,aAAa,EACd,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EACL,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAMrC,oBAAY,aAAa,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAClE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAQjE;AAOD,wBAAgB,qBAAqB;;;cAUpC;AAED,wBAAgB,kBAAkB,IAAI,YAAY,GAAG,SAAS,CAI7D;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAWlE;AAED,wBAAgB,eAAe,CAAC,MAAM,KAAA,OAIrC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,QAI9C;AAED,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,kBAAkB,GACpC,oBAAoB,CA2BtB;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,aAAa,EAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAuD7B;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,GAAG;;;;GA2BrD;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,iBAgChB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE;QACV,CAAC,aAAa,EAAE,MAAM,GAAG;YACvB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,GAAG,IAAI,CA0BP;AAOD,wBAAgB,sBAAsB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAK7D"}

package/lib/builder/util/common.js

@@ -59,11 +59,13 @@ function getSelfPackageJson() {
 }
 exports.getSelfPackageJson = getSelfPackageJson;
 function JsonToStringWithVariableName(copyJson) {
-    return JSON.stringify(copyJson, null, 2)
-        .replace(/"%%%(.*?)%%%"/g, function (match, expression) {
-        return expression.replace(/\\"/g, '"');
-    })
-        .replace(/\\n/g, '');
+    return JSON.stringify(copyJson, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
+        return expression
+            .replace(/\\"/g, '"')
+            .replace(/\\'/g, "'")
+            .replace(/\\r/g, '\r')
+            .replace(/\\n/g, '\n');
+    });
 }
 exports.JsonToStringWithVariableName = JsonToStringWithVariableName;
 function requireUncached(module) {

package/lib/generator/template.js

@@ -23,7 +23,7 @@ exports.default = {
         "code": "import { setConfig, initTcb, CLOUD_SDK } from '@cloudbase/weda-cloud-sdk/dist/h5';\nimport config from './config';\nexport {\n  createDataset,\n  createStateDataSourceVar,\n  generateParamsParser,\n  EXTRA_API,\n  CLOUD_SDK,\n  DS_API,\n  DS_SDK,\n} from '@cloudbase/weda-cloud-sdk/dist/h5';\n\nsetConfig(config);\ninitTcb();\n"
     },
     "/src/handlers/NodeRenderer.jsx": {
-        "code": "import * as React from 'react';\nimport {\n  useContext,\n  useCallback,\n  createContext,\n  useState,\n  useRef,\n} from 'react';\nimport { observer } from 'mobx-react-lite';\nimport { emitEvent, translateStyleToRem, checkVisible } from '../utils';\nimport { get, set } from 'lodash';\nimport { getDom } from '../utils/widgets';\n\nexport const ForContext = createContext({});\n\nexport const CompRenderer = observer(function (props) {\n  const {\n    id: compId,\n    xProps,\n    virtualFields,\n    slots = {},\n    codeContext = {},\n    scopeContext = {},\n    genericComp = {},\n    emitEvents = [],\n    componentSchema = {},\n  } = props;\n\n  const [blockIndex, setBlockIndex] = useState();\n  const [blockType, setBlockType] = useState();\n  const indexRef = useRef();\n  const typeRef = useRef();\n  indexRef.current = blockIndex;\n  typeRef.current = blockType;\n\n  const isInComposite = !!codeContext.$WEAPPS_COMP;\n  // 判断 widgets 是从 page 来的，还是组件来的\n  const widgetsData = !isInComposite\n    ? codeContext.$page.widgets[compId]\n    : codeContext.$WEAPPS_COMP.widgets[compId];\n\n  const isRootNode = widgetsData && !widgetsData.parent;\n\n  if (!xProps) {\n    return props.children;\n  }\n\n  const {\n    commonStyle = {},\n    sourceKey,\n    listenerInstances,\n    classNameList = [],\n    staticResourceAttribute = [],\n  } = xProps;\n  const dataBinds =\n    (codeContext._dataBinds && codeContext._dataBinds[compId]) || {};\n  const FieldKey = genericComp.propName\n    ? codeContext.node[genericComp.propName]\n    : sourceKey;\n  const Field = virtualFields[FieldKey];\n  const parentForItems = useContext(ForContext);\n\n  // 组件最终用于执行的事件函数\n  const emit = useCallback(\n    (trigger, eventData, forItems, domEvent, scopeContext) => {\n      const listeners = listenerInstances;\n      const event = {\n        detail: eventData,\n        name: trigger,\n        target: widgetsData,\n        currentTarget: widgetsData,\n        domEvent,\n      };\n      forItems = {\n        ...forItems,\n        forIndexes: getForIndexes(forItems, widgetsData),\n      };\n      emitEvent(\n        trigger,\n        listeners,\n        {\n          event,\n          customEventData: event,\n          forItems,\n          domEvent,\n        },\n        scopeContext\n      );\n    },\n    [props]\n  );\n\n  // 选区最终用于执行的事件函数\n  const emitSB = useCallback(\n    (trigger, eventData, forItems, domEvent, scopeContext, fieldData) => {\n      const listeners =\n        typeRef.current &&\n        indexRef.current &&\n        fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[\n          'x-props'\n        ]?.listenerInstances;\n      const event = {\n        detail: eventData,\n        name: trigger,\n        target: widgetsData,\n        currentTarget: widgetsData,\n        domEvent,\n      };\n      forItems = {\n        ...forItems,\n        forIndexes: getForIndexes(forItems, widgetsData),\n      };\n      emitEvent(\n        trigger,\n        listeners,\n        {\n          event,\n          customEventData: event,\n          forItems,\n          domEvent,\n        },\n        scopeContext\n      );\n    },\n    [props]\n  );\n\n  function getSafeComponentProps({\n    style,\n    classNameList,\n    staticResourceAttribute,\n  }) {\n    const componentProps = {};\n    if (classNameList.length) {\n      componentProps.className = classNameList.join(' ');\n    }\n\n    if (style && Object.keys(style).length) {\n      componentProps.style = style;\n    }\n\n    if (staticResourceAttribute && staticResourceAttribute.length > 0) {\n      componentProps.staticResourceAttribute = staticResourceAttribute;\n    }\n    return componentProps;\n  }\n\n  // 选区的预览的click事件\n  const onCustomEvent = ({ order: index, blockKey }) => {\n    if (index) {\n      setBlockIndex(index);\n      setBlockType(blockKey);\n    }\n  };\n\n  // For循环渲染\n  let forList;\n  try {\n    forList = dataBinds && dataBinds._waFor && dataBinds._waFor(parentForItems);\n  } catch (e) {\n    forList = [];\n    console.error('_waFor data', e);\n  }\n  if (forList) {\n    if (!Array.isArray(forList)) {\n      console.warn(`${compId}循环绑定非数组值：`, forList);\n      forList = [];\n    }\n    return forList.map((item, index) => {\n      const forItemsIndexes = (parentForItems.forIndexes || []).concat(index);\n      const forItems = {\n        ...parentForItems,\n        [compId]: item,\n        forIndexes: forItemsIndexes,\n      };\n      const {\n        fieldData: forItemData,\n        finalStyle: forItemStyle,\n        finalClassNameList: forItemClassNameList,\n      } = getBindData(forItems, scopeContext);\n      if (!checkVisible(forItemData)) {\n        return null;\n      }\n      // 多个组件的 slot 属性\n      Object.keys(slots).forEach((slotProp) => {\n        set(forItemData, slotProp, slots[slotProp]);\n      });\n      const emitWithForItems = (trigger, eventData, domEvent) =>\n        emit(trigger, eventData, forItems, domEvent, scopeContext);\n\n      const _selectableBlockEventsForItems = {\n        onCustomEvent,\n        events:\n          componentSchema?.selectableBlock?.events.map((item) => item.name) ||\n          [],\n        emit: (trigger, eventData, domEvent) =>\n          emitSB(\n            trigger,\n            eventData,\n            forItems,\n            domEvent,\n            scopeContext,\n            forItemData\n          ),\n      };\n\n      delete forItemData.style;\n\n      // 获取当前元素的 ref\n      const currentWidget = Array.isArray(widgetsData)\n        ? get(widgetsData, forItemsIndexes)\n        : widgetsData;\n      const domRef = setGetDomApi(currentWidget, props);\n      return (\n        <ForContext.Provider key={index} value={forItems}>\n          <Field\n            data={{\n              ...forItemData,\n              _selectableBlockEvents: _selectableBlockEventsForItems,\n            }}\n            id={compId}\n            {...getSafeComponentProps({\n              style: forItemStyle,\n              classNameList: forItemClassNameList,\n              staticResourceAttribute,\n            })}\n            emit={emitWithForItems}\n            events={emitEvents}\n            compositeParent={codeContext}\n            forIndexes={forItemsIndexes}\n            $node={currentWidget}\n            domRef={domRef}\n          >\n            {props.children}\n          </Field>\n        </ForContext.Provider>\n      );\n    });\n  }\n\n  // 单节点渲染\n  const { fieldData, finalClassNameList, finalStyle } = getBindData(\n    parentForItems,\n    scopeContext\n  );\n  const emitWithFiedle = (trigger, eventData, domEvent) =>\n    emit(trigger, eventData, parentForItems, domEvent, scopeContext);\n\n  const _selectableBlockEventsWithFiedle = {\n    onCustomEvent,\n    events:\n      componentSchema?.selectableBlock?.events.map((item) => item.name) || [],\n    emit: (trigger, eventData, domEvent) =>\n      emitSB(\n        trigger,\n        eventData,\n        parentForItems,\n        domEvent,\n        scopeContext,\n        fieldData\n      ),\n  };\n\n  // false 或空字符串时\n  if (!checkVisible(fieldData)) {\n    return null;\n  }\n\n  // 单个组件的 slot 属性\n  Object.keys(slots).forEach((slotProp) => {\n    set(fieldData, slotProp, slots[slotProp]);\n  });\n\n  // 防止渲染时 data 的 style 与实际的 style 冲突\n  delete fieldData.style;\n\n  // 修正 forIndexes\n  const forIndexes = getForIndexes(parentForItems, widgetsData);\n\n  // 获取 Element Ref\n  const currentWidget = Array.isArray(widgetsData)\n    ? get(widgetsData, forIndexes)\n    : widgetsData;\n  const domRef = setGetDomApi(currentWidget, props);\n\n  return (\n    <Field\n      data={{\n        ...fieldData,\n        _selectableBlockEvents: _selectableBlockEventsWithFiedle,\n      }}\n      id={compId}\n      {...getSafeComponentProps({\n        style: finalStyle,\n        classNameList: finalClassNameList,\n        staticResourceAttribute,\n      })}\n      emit={emitWithFiedle}\n      events={emitEvents}\n      compositeParent={codeContext}\n      forIndexes={forIndexes}\n      $node={currentWidget}\n      domRef={domRef}\n    >\n      {props.children}\n    </Field>\n  );\n\n  // TODO: 需要不断移除 dataBinds(style/classList)\n  function getBindData(forItems, scopeContext) {\n    // bindData\n    let wData = widgetsData;\n    if (Array.isArray(wData)) {\n      wData =\n        forItems.forIndexes === void 0 || wData.length === 0\n          ? {}\n          : get(wData, getForIndexes(forItems, wData));\n    }\n    wData = wData || {};\n    const fieldData = { ...wData };\n\n    // 再次计算 scope value\n    for (let key in fieldData) {\n      if (Object.prototype.hasOwnProperty.call(fieldData, key)) {\n        const value = fieldData[key];\n        if (value && value.__type === 'scopedValue') {\n          try {\n            fieldData[key] = value.getValue(scopeContext);\n          } catch (e) {\n            console.warn(`Error computing data bind '${key}' error:`, e);\n            fieldData[key] = '';\n          }\n        }\n      }\n    }\n\n    // bindStyle\n    let bindStyle = fieldData.style || {};\n    // 复合组件第一层需要将最外层样式 style 挂到节点上\n    let cssStyle = commonStyle;\n    if (isInComposite && wData && !wData.parent) {\n      cssStyle = {\n        ...cssStyle,\n        ...(codeContext.$WEAPPS_COMP.props?.style || {}),\n      };\n      bindStyle = {\n        ...bindStyle,\n        ...(codeContext.$WEAPPS_COMP.props?.style || {}),\n      };\n    }\n    const finalStyle = getFinalStyle(cssStyle, bindStyle);\n\n    // bindClassList\n    const bindClassList = fieldData.classList || [];\n    const finalClassNameList = getFinalClassNameList(\n      classNameList,\n      bindClassList\n    );\n\n    // 当前在复合组件中，且当前节点为根节点\n    if (isInComposite && isRootNode) {\n      if (wData.ownerWidget) {\n        Object.keys(wData.ownerWidget).forEach((propName) => {\n          if (\n            propName === 'role' ||\n            ['aria-', 'data-'].some((prefix) => propName.startsWith(prefix))\n          ) {\n            wData[propName] = wData.ownerWidget[propName];\n          }\n        });\n      }\n    }\n\n    return { fieldData, finalStyle, finalClassNameList };\n  }\n});\n\nexport function getFinalStyle(\n  commonStyle = {},\n  bindStyle = {},\n  widgetStyle = {}\n) {\n  const remBindStyle =\n    typeof bindStyle === 'object' ? translateStyleToRem(bindStyle) : {};\n\n  return {\n    ...(translateStyleToRem(commonStyle) || {}),\n    ...(translateStyleToRem(widgetStyle) || {}),\n    ...remBindStyle,\n  };\n}\n\nexport function getFinalClassNameList(\n  classNameList = [],\n  bindClassList = [],\n  widgetClassList = []\n) {\n  return [].concat(classNameList, bindClassList, widgetClassList);\n}\n\n// HACK: 从后向前保证循环的深度与 forIndexes 一致\n// 后续需要将 For 循环迁移到外层\nfunction getForIndexes(parentForItems, widgetsData) {\n  return Array.isArray(widgetsData) && widgetsData.length > 0\n    ? (parentForItems.forIndexes || []).slice(0 - getDeepArrLen(widgetsData))\n    : undefined;\n}\n\nfunction getDeepArrLen(arr, len = 0) {\n  if (Array.isArray(arr)) {\n    return getDeepArrLen(arr[0], len + 1);\n  } else {\n    return len;\n  }\n}\n\nfunction setGetDomApi(currentWidget, props) {\n  if (!currentWidget) return React.createRef();\n  const isComposite = !currentWidget.widgetType.startsWith('gsd-h5-react');\n  const isInComposite = !!(props.codeContext || {}).$WEAPPS_COMP;\n\n  // 如果当前是复合组件，不做 getDom 的挂载\n  if (!isComposite) {\n    if (!currentWidget.domRef) {\n      currentWidget.domRef = React.createRef();\n    }\n    if (!currentWidget.getDom) {\n      currentWidget.getDom = (options) =>\n        getDom(currentWidget.domRef.current, options);\n    }\n\n    if (\n      isInComposite && // 当前在复合组件内\n      !currentWidget.parent && // 当前节点为复合组件的根节点\n      props.codeContext.node && // 复合组件的 node 已经创建\n      !props.codeContext.node.getDom // 复合组件的 node 未挂载 getDom 方法\n    ) {\n      props.codeContext.node.domRef = currentWidget.domRef;\n      props.codeContext.node.getDom = currentWidget.getDom;\n    }\n  }\n\n  return currentWidget.domRef;\n}\n"
+        "code": "import * as React from 'react';\nimport {\n  useContext,\n  useCallback,\n  createContext,\n  useState,\n  useRef,\n} from 'react';\nimport { observer } from 'mobx-react-lite';\nimport { emitEvent, translateStyleToRem, checkVisible } from '../utils';\nimport { get, set } from 'lodash';\nimport { getDom } from '../utils/widgets';\n\nexport const ForContext = createContext({});\n\nexport const CompRenderer = observer(function (props) {\n  const {\n    id: compId,\n    xProps,\n    virtualFields,\n    slots = {},\n    codeContext = {},\n    scopeContext = {},\n    genericComp = {},\n    emitEvents = [],\n    componentSchema = {},\n  } = props;\n\n  const [blockIndex, setBlockIndex] = useState();\n  const [blockType, setBlockType] = useState();\n  const indexRef = useRef();\n  const typeRef = useRef();\n  indexRef.current = blockIndex;\n  typeRef.current = blockType;\n\n  const isInComposite = !!codeContext.$WEAPPS_COMP;\n  // 判断 widgets 是从 page 来的，还是组件来的\n  const widgetsData = !isInComposite\n    ? codeContext.$page.widgets[compId]\n    : codeContext.$WEAPPS_COMP.widgets[compId];\n\n  const isRootNode = widgetsData && !widgetsData.parent;\n\n  if (!xProps) {\n    return props.children;\n  }\n\n  const {\n    commonStyle = {},\n    sourceKey,\n    listenerInstances,\n    classNameList = [],\n    staticResourceAttribute = [],\n  } = xProps;\n  const dataBinds =\n    (codeContext._dataBinds && codeContext._dataBinds[compId]) || {};\n  const FieldKey = genericComp.propName\n    ? codeContext.node[genericComp.propName]\n    : sourceKey;\n  const Field = virtualFields[FieldKey];\n  const parentForItems = useContext(ForContext);\n\n  // 组件最终用于执行的事件函数\n  const emit = useCallback(\n    (trigger, eventData, forItems, domEvent, scopeContext) => {\n      const listeners = listenerInstances;\n      const event = {\n        detail: eventData,\n        name: trigger,\n        target: widgetsData,\n        currentTarget: widgetsData,\n        domEvent,\n      };\n      forItems = {\n        ...forItems,\n        forIndexes: getForIndexes(forItems, widgetsData),\n      };\n      emitEvent(\n        trigger,\n        listeners,\n        {\n          event,\n          customEventData: event,\n          forItems,\n          domEvent,\n        },\n        scopeContext\n      );\n    },\n    [props]\n  );\n\n  // 选区最终用于执行的事件函数\n  const emitSB = useCallback(\n    (trigger, eventData, forItems, domEvent, scopeContext, fieldData) => {\n      const listeners =\n        typeRef?.current &&\n        indexRef?.current !== undefined &&\n        fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[\n          'x-props'\n        ]?.listenerInstances;\n      const event = {\n        detail: eventData,\n        name: trigger,\n        target: widgetsData,\n        currentTarget: widgetsData,\n        domEvent,\n      };\n      forItems = {\n        ...forItems,\n        forIndexes: getForIndexes(forItems, widgetsData),\n      };\n      emitEvent(\n        trigger,\n        listeners,\n        {\n          event,\n          customEventData: event,\n          forItems,\n          domEvent,\n        },\n        scopeContext\n      );\n    },\n    [props]\n  );\n\n  function getSafeComponentProps({\n    style,\n    classNameList,\n    staticResourceAttribute,\n  }) {\n    const componentProps = {};\n    if (classNameList.length) {\n      componentProps.className = classNameList.join(' ');\n    }\n\n    if (style && Object.keys(style).length) {\n      componentProps.style = style;\n    }\n\n    if (staticResourceAttribute && staticResourceAttribute.length > 0) {\n      componentProps.staticResourceAttribute = staticResourceAttribute;\n    }\n    return componentProps;\n  }\n\n  // 选区的预览的click事件\n  const onCustomEvent = ({ order: index, blockKey }) => {\n    if (index !== undefined) {\n      setBlockIndex(index);\n      setBlockType(blockKey);\n    }\n  };\n\n  // For循环渲染\n  let forList;\n  try {\n    forList = dataBinds && dataBinds._waFor && dataBinds._waFor(parentForItems);\n  } catch (e) {\n    forList = [];\n    console.error('_waFor data', e);\n  }\n  if (forList) {\n    if (!Array.isArray(forList)) {\n      console.warn(`${compId}循环绑定非数组值：`, forList);\n      forList = [];\n    }\n    return forList.map((item, index) => {\n      const forItemsIndexes = (parentForItems.forIndexes || []).concat(index);\n      const forItems = {\n        ...parentForItems,\n        [compId]: item,\n        forIndexes: forItemsIndexes,\n      };\n      const {\n        fieldData: forItemData,\n        finalStyle: forItemStyle,\n        finalClassNameList: forItemClassNameList,\n      } = getBindData(forItems, scopeContext);\n      if (!checkVisible(forItemData)) {\n        return null;\n      }\n      // 多个组件的 slot 属性\n      Object.keys(slots).forEach((slotProp) => {\n        set(forItemData, slotProp, slots[slotProp]);\n      });\n      const emitWithForItems = (trigger, eventData, domEvent) =>\n        emit(trigger, eventData, forItems, domEvent, scopeContext);\n\n      const _selectableBlockEventsForItems = {\n        onCustomEvent,\n        events:\n          componentSchema?.selectableBlock?.events.map((item) => item.name) ||\n          [],\n        emit: (trigger, eventData, domEvent) =>\n          emitSB(\n            trigger,\n            eventData,\n            forItems,\n            domEvent,\n            scopeContext,\n            forItemData\n          ),\n      };\n\n      delete forItemData.style;\n\n      // 获取当前元素的 ref\n      const currentWidget = Array.isArray(widgetsData)\n        ? get(widgetsData, forItemsIndexes)\n        : widgetsData;\n      const domRef = setGetDomApi(currentWidget, props);\n      return (\n        <ForContext.Provider key={index} value={forItems}>\n          <Field\n            data={{\n              ...forItemData,\n              _selectableBlockEvents: _selectableBlockEventsForItems,\n            }}\n            id={compId}\n            {...getSafeComponentProps({\n              style: forItemStyle,\n              classNameList: forItemClassNameList,\n              staticResourceAttribute,\n            })}\n            emit={emitWithForItems}\n            events={emitEvents}\n            compositeParent={codeContext}\n            forIndexes={forItemsIndexes}\n            $node={currentWidget}\n            domRef={domRef}\n          >\n            {props.children}\n          </Field>\n        </ForContext.Provider>\n      );\n    });\n  }\n\n  // 单节点渲染\n  const { fieldData, finalClassNameList, finalStyle } = getBindData(\n    parentForItems,\n    scopeContext\n  );\n  const emitWithFiedle = (trigger, eventData, domEvent) =>\n    emit(trigger, eventData, parentForItems, domEvent, scopeContext);\n\n  const _selectableBlockEventsWithFiedle = {\n    onCustomEvent,\n    events:\n      componentSchema?.selectableBlock?.events.map((item) => item.name) || [],\n    emit: (trigger, eventData, domEvent) =>\n      emitSB(\n        trigger,\n        eventData,\n        parentForItems,\n        domEvent,\n        scopeContext,\n        fieldData\n      ),\n  };\n\n  // false 或空字符串时\n  if (!checkVisible(fieldData)) {\n    return null;\n  }\n\n  // 单个组件的 slot 属性\n  Object.keys(slots).forEach((slotProp) => {\n    set(fieldData, slotProp, slots[slotProp]);\n  });\n\n  // 防止渲染时 data 的 style 与实际的 style 冲突\n  delete fieldData.style;\n\n  // 修正 forIndexes\n  const forIndexes = getForIndexes(parentForItems, widgetsData);\n\n  // 获取 Element Ref\n  const currentWidget = Array.isArray(widgetsData)\n    ? get(widgetsData, forIndexes)\n    : widgetsData;\n  const domRef = setGetDomApi(currentWidget, props);\n\n  return (\n    <Field\n      data={{\n        ...fieldData,\n        _selectableBlockEvents: _selectableBlockEventsWithFiedle,\n      }}\n      id={compId}\n      {...getSafeComponentProps({\n        style: finalStyle,\n        classNameList: finalClassNameList,\n        staticResourceAttribute,\n      })}\n      emit={emitWithFiedle}\n      events={emitEvents}\n      compositeParent={codeContext}\n      forIndexes={forIndexes}\n      $node={currentWidget}\n      domRef={domRef}\n    >\n      {props.children}\n    </Field>\n  );\n\n  // TODO: 需要不断移除 dataBinds(style/classList)\n  function getBindData(forItems, scopeContext) {\n    // bindData\n    let wData = widgetsData;\n    if (Array.isArray(wData)) {\n      wData =\n        forItems.forIndexes === void 0 || wData.length === 0\n          ? {}\n          : get(wData, getForIndexes(forItems, wData));\n    }\n    wData = wData || {};\n    const fieldData = { ...wData };\n\n    // 再次计算 scope value\n    for (let key in fieldData) {\n      if (Object.prototype.hasOwnProperty.call(fieldData, key)) {\n        const value = fieldData[key];\n        if (value && value.__type === 'scopedValue') {\n          try {\n            fieldData[key] = value.getValue(scopeContext);\n          } catch (e) {\n            console.warn(`Error computing data bind '${key}' error:`, e);\n            fieldData[key] = '';\n          }\n        }\n      }\n    }\n\n    // bindStyle\n    let bindStyle = fieldData.style || {};\n    // 复合组件第一层需要将最外层样式 style 挂到节点上\n    let cssStyle = commonStyle;\n    if (isInComposite && wData && !wData.parent) {\n      cssStyle = {\n        ...cssStyle,\n        ...(codeContext.$WEAPPS_COMP.props?.style || {}),\n      };\n      bindStyle = {\n        ...bindStyle,\n        ...(codeContext.$WEAPPS_COMP.props?.style || {}),\n      };\n    }\n    const finalStyle = getFinalStyle(cssStyle, bindStyle);\n\n    // bindClassList\n    const bindClassList = fieldData.classList || [];\n    const finalClassNameList = getFinalClassNameList(\n      classNameList,\n      bindClassList\n    );\n\n    // 当前在复合组件中，且当前节点为根节点\n    if (isInComposite && isRootNode) {\n      if (wData.ownerWidget) {\n        Object.keys(wData.ownerWidget).forEach((propName) => {\n          if (\n            propName === 'role' ||\n            ['aria-', 'data-'].some((prefix) => propName.startsWith(prefix))\n          ) {\n            wData[propName] = wData.ownerWidget[propName];\n          }\n        });\n      }\n    }\n\n    return { fieldData, finalStyle, finalClassNameList };\n  }\n});\n\nexport function getFinalStyle(\n  commonStyle = {},\n  bindStyle = {},\n  widgetStyle = {}\n) {\n  const remBindStyle =\n    typeof bindStyle === 'object' ? translateStyleToRem(bindStyle) : {};\n\n  return {\n    ...(translateStyleToRem(commonStyle) || {}),\n    ...(translateStyleToRem(widgetStyle) || {}),\n    ...remBindStyle,\n  };\n}\n\nexport function getFinalClassNameList(\n  classNameList = [],\n  bindClassList = [],\n  widgetClassList = []\n) {\n  return [].concat(classNameList, bindClassList, widgetClassList);\n}\n\n// HACK: 从后向前保证循环的深度与 forIndexes 一致\n// 后续需要将 For 循环迁移到外层\nfunction getForIndexes(parentForItems, widgetsData) {\n  return Array.isArray(widgetsData) && widgetsData.length > 0\n    ? (parentForItems.forIndexes || []).slice(0 - getDeepArrLen(widgetsData))\n    : undefined;\n}\n\nfunction getDeepArrLen(arr, len = 0) {\n  if (Array.isArray(arr)) {\n    return getDeepArrLen(arr[0], len + 1);\n  } else {\n    return len;\n  }\n}\n\nfunction setGetDomApi(currentWidget, props) {\n  if (!currentWidget) return React.createRef();\n  const isComposite = !currentWidget.widgetType.startsWith('gsd-h5-react');\n  const isInComposite = !!(props.codeContext || {}).$WEAPPS_COMP;\n\n  // 如果当前是复合组件，不做 getDom 的挂载\n  if (!isComposite) {\n    if (!currentWidget.domRef) {\n      currentWidget.domRef = React.createRef();\n    }\n    if (!currentWidget.getDom) {\n      currentWidget.getDom = (options) =>\n        getDom(currentWidget.domRef.current, options);\n    }\n\n    if (\n      isInComposite && // 当前在复合组件内\n      !currentWidget.parent && // 当前节点为复合组件的根节点\n      props.codeContext.node && // 复合组件的 node 已经创建\n      !props.codeContext.node.getDom // 复合组件的 node 未挂载 getDom 方法\n    ) {\n      props.codeContext.node.domRef = currentWidget.domRef;\n      props.codeContext.node.getDom = currentWidget.getDom;\n    }\n  }\n\n  return currentWidget.domRef;\n}\n"
     },
     "/src/handlers/RenderWrapper.jsx": {
         "code": "import * as React from 'react';\nimport { useRef } from 'react';\nimport { CompRenderer } from './NodeRenderer';\nimport lodashSet from 'lodash.set';\nimport cloneDeep from 'lodash.clonedeep';\nimport { isScopeSlot } from '../utils/common';\n\nfunction getComponentChildren(component) {\n  const { properties } = component;\n  if (!properties) {\n    return [];\n  }\n  return Object.values(properties).sort(\n    (a, b) => (a['x-index'] || 0) - (b['x-index'] || 0)\n  );\n}\n\nexport function AppRender(props) {\n  const {\n    className,\n    virtualFields,\n    componentSchema,\n    renderSlot,\n    rootNode = true,\n    codeContext,\n    scopeContext = {},\n  } = props;\n  const {\n    'x-props': xProps,\n    properties = {},\n    genericComp = {},\n  } = componentSchema;\n  // 判断是否为 slot\n  const isSlot = !xProps;\n  if (isSlot && !(renderSlot || rootNode)) {\n    return null;\n  }\n\n  const preClassName = useRef();\n\n  // wrapperClass\n  const containerEl = Object.values(properties)[0];\n  if (containerEl && containerEl['x-props'] && className) {\n    let { classNameList = [] } = containerEl['x-props'];\n\n    // 先替换掉先前计算出来的className部分\n    if (preClassName.current) {\n      if (preClassName.current !== className) {\n        classNameList = classNameList.filter(\n          (clsName) => clsName !== preClassName.current\n        );\n        preClassName.current = className;\n      }\n    } else {\n      preClassName.current = className;\n    }\n\n    containerEl['x-props'].classNameList = [className, ...classNameList];\n  }\n\n  if (xProps && xProps.sourceKey) {\n    const { sourceKey } = xProps;\n    const Field = virtualFields[sourceKey];\n    if (!Field) {\n      return (\n        <div style={{ color: 'red' }}>\n          组件<em>{sourceKey}</em>未找到\n        </div>\n      );\n    }\n  }\n  const children = getComponentChildren(componentSchema);\n  const slots = {};\n  // eslint-disable-next-line guard-for-in\n  for (const key in properties) {\n    const child = properties[key];\n    if (!child['x-props'] && child.properties) {\n      slots[key] = isScopeSlot(componentSchema, key) ? (\n        (props) => {\n          let clonedScopeContext = cloneDeep(scopeContext);\n          lodashSet(\n            clonedScopeContext,\n            `${componentSchema.key}.${child.key}`,\n            props\n          );\n          return (\n            <AppRender\n              key={child.key}\n              componentSchema={child}\n              renderSlot\n              virtualFields={virtualFields}\n              codeContext={codeContext}\n              scopeContext={clonedScopeContext}\n            />\n          );\n        }\n      ) : (\n        <AppRender\n          key={child.key}\n          componentSchema={child}\n          renderSlot\n          virtualFields={virtualFields}\n          codeContext={codeContext}\n          scopeContext={scopeContext}\n        />\n      );\n    }\n  }\n\n  return (\n    <CompRenderer\n      id={componentSchema.key}\n      xProps={xProps}\n      emitEvents={componentSchema.emitEvents || []}\n      componentSchema={componentSchema}\n      virtualFields={virtualFields}\n      slots={slots}\n      codeContext={codeContext}\n      scopeContext={scopeContext}\n      genericComp={genericComp}\n    >\n      {children.map((comp) => (\n        <AppRender\n          key={comp.key}\n          componentSchema={comp}\n          rootNode={false}\n          renderSlot={false}\n          virtualFields={virtualFields}\n          codeContext={codeContext}\n          scopeContext={scopeContext}\n        />\n      ))}\n    </CompRenderer>\n  );\n}\n"

package/package.json

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

package/template/generator/handlers/NodeRenderer.jsx

@@ -94,8 +94,8 @@ export const CompRenderer = observer(function (props) {
   const emitSB = useCallback(
     (trigger, eventData, forItems, domEvent, scopeContext, fieldData) => {
       const listeners =
-        typeRef.current &&
-        indexRef.current &&
+        typeRef?.current &&
+        indexRef?.current !== undefined &&
         fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[
           'x-props'
         ]?.listenerInstances;
@@ -147,7 +147,7 @@ export const CompRenderer = observer(function (props) {
 
   // 选区的预览的click事件
   const onCustomEvent = ({ order: index, blockKey }) => {
-    if (index) {
+    if (index !== undefined) {
       setBlockIndex(index);
       setBlockType(blockKey);
     }

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.0",
 	"scripts": {	},
 	"dependencies": {
-		"@cloudbase/weda-cloud-sdk": "stable",
+		"@cloudbase/weda-cloud-sdk": "1.0.1",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

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

@@ -86,8 +86,8 @@ export const CompRenderer = observer(function (props) {
   const emitSB = useCallback(
     (trigger, event, forItems, scopeContext, fieldData) => {
       const listeners =
-        indexRef.current &&
-        typeRef.current &&
+        indexRef?.current !== undefined &&
+        typeRef?.current &&
         fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[
           'x-props'
         ]?.listenerInstances;
@@ -131,7 +131,7 @@ export const CompRenderer = observer(function (props) {
 
   // 选区的预览的click事件
   const onCustomEvent = ({ order: index, blockKey }) => {
-    if (index) {
+    if (index !== undefined) {
       setBlockIndex(index);
       setBlockType(blockKey);
     }