@cloudbase/lowcode-builder 0.1.23 → 0.1.24

package/lib/builder/mp/wxml.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedComponents = exports.getMpEventHanlderName = exports.generateWxml = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const xml_js_1 = require("xml-js");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const materials_1 = require("./materials");
@@ -14,9 +13,7 @@ const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib
 const error = chalk_1.default.redBright;
 function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, componentGenerics, nodeTransform) {
     var _a;
-    const nameMangler = ctx.isProduction
-        ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags })
-        : undefined;
+    const nameMangler = ctx.isProduction ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags }) : undefined;
     const xmlJson = {
         elements: [
             {
@@ -57,9 +54,9 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
     function createXml(widgets, parent = null, parentForNodes = []) {
         var _a, _b, _c, _d, _e;
         const elements = [];
-        for (const id in widgets) {
+        for (const id of Object.keys(widgets !== null && widgets !== void 0 ? widgets : {})) {
             const { xComponent, xProps, properties, xIndex, genericComp } = widgets[id];
-            const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'], } = xProps || {};
+            const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'] } = xProps || {};
             const data = { ...data0 };
             if (directives.waIf && directives.waIf.value === false) {
                 continue;
@@ -110,17 +107,13 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 .join('')}`;
             const idAttr = curForNodes.length < 1
                 ? id
-                : `{{'${id}'${curForNodes
-                    .map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`)
-                    .join('')}}}`;
+                : `{{'${id}'${curForNodes.map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`).join('')}}}`;
             if (tagName === 'slot') {
                 const slotNode = {
                     type: 'element',
                     name: tagName,
                     attributes: {
-                        name: data0.name.type && data0.name.type !== 'static'
-                            ? `{{${id}.name}}`
-                            : data0.name.value,
+                        name: data0.name.type && data0.name.type !== 'static' ? `{{${id}.name}}` : data0.name.value,
                     },
                     elements: [],
                     _order: xIndex || 0,
@@ -206,8 +199,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             listeners.forEach((l) => {
                 const evtName = getMpEventName(l.trigger);
                 const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] =
-                    getMpEventHanlderName(id, evtName, modifiers);
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
             });
             // 扩展组件配置
             const compConfig = componentProto.compConfig;
@@ -240,9 +232,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             }*/
             node.elements = node.elements.concat(createXml(properties, node, curForNodes));
             // 特殊处理 swiper，对swiper 子节点包裹议程 swiperItem
-            if (tagName === 'swiper' ||
-                componentKey === 'weda:Swiper' ||
-                componentKey === 'gsd-h5-react:Swiper') {
+            if (tagName === 'swiper' || componentKey === 'weda:Swiper' || componentKey === 'gsd-h5-react:Swiper') {
                 node.elements = node.elements.map((item, index) => {
                     var _a, _b;
                     let { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ['wx:if']: wxIf, ...itemRestKey } = item.attributes || {};
@@ -362,10 +352,8 @@ function getUsedComponents(widgets, usedCmps = {}) {
 exports.getUsedComponents = getUsedComponents;
 function getAttrBind(dVale, widgetBind, isStaticResource) {
     const { type, value } = dVale;
-    const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;
-    return isStaticResource
-        ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}`
-        : `{{${attrVal}}}`;
+    const attrVal = widgetBind;
+    return isStaticResource ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}` : `{{${attrVal}}}`;
 }
 function getGenericCompTagName(propName) {
     return `g--${propName}`;
@@ -404,7 +392,5 @@ function isGlobalAttr(prop = '') {
         'title',
         'translate',
     ];
-    return (globalAttrs.indexOf(prop) > -1 ||
-        prop.startsWith('data-') ||
-        prop.startsWith('aria-'));
+    return globalAttrs.indexOf(prop) > -1 || prop.startsWith('data-') || prop.startsWith('aria-');
 }

package/package.json

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

package/template/mp/common/weapp-component.js

@@ -5,7 +5,7 @@ import mergeRenderer from './merge-renderer'
 import { runWatchers } from './watch'
 import sdk from './weapp-sdk'
 import lodashGet from 'lodash.get';
-import { resolveWidgetData } from './widget';
+import { createInitData } from './widget';
 
 /**
  * Lowcodes of all components
@@ -13,11 +13,7 @@ import { resolveWidgetData } from './widget';
 export const compLowcodes = {}
 
 export function createComponent(key, behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes, undefined, context) {
-  const initData = {};
-  for (const id in widgetProps) {
-    const props = widgetProps[id]
-    initData['' + id] = resolveWidgetData(props)
-  }
+  const initData = createInitData(widgetProps, dataBinds, '');
   compLowcodes[key] = {
     index,
     stateFn,

package/template/mp/common/widget.js

@@ -303,6 +303,8 @@ export function createInitData(widgets, dataBinds, keyPrefix = '') {
   return Object.keys(widgets).reduce((result, id) => {
     if (!isWidgetInFor(id, widgets, dataBinds)) {
       result[keyPrefix + id] = resolveWidgetData(widgets[id])
+    } else {
+      result[keyPrefix + id] = []
     }
     return result
   }, {})