@cloudbase/lowcode-builder 0.1.21 → 0.1.24

package/lib/builder/mp/util.d.ts

@@ -1,9 +1,9 @@
-import { IDynamicValue, IWeAppComponentInstance } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IDynamicValue, IWeAppComponentInstance, ICompositedComponent } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
-export declare function extractWidgetProps(props: Required<IWeAppComponentInstance>['xProps']): any;
+export declare function extractWidgetProps(props: Required<IWeAppComponentInstance>['xProps'], compInfo: ICompositedComponent): any;
 export declare function generatedDynamicData(data: {
     [key: string]: IDynamicValue;
-}): {
+}, compInfo?: ICompositedComponent): {
     staticProps: {};
     boundProps: {};
 };

package/lib/builder/mp/util.js

@@ -5,7 +5,7 @@ const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
 const wxml_1 = require("./wxml");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
-function extractWidgetProps(props) {
+function extractWidgetProps(props, compInfo) {
     const { classList } = props;
     const staticProps = {
         style: (0, weapps_core_1.toCssStyle)(props.commonStyle, {
@@ -15,19 +15,31 @@ function extractWidgetProps(props) {
         classList: classList || [],
     };
     const { data = {} } = props;
-    Object.assign(staticProps, generatedDynamicData(data).staticProps);
+    Object.assign(staticProps, generatedDynamicData(data, compInfo).staticProps);
     return staticProps;
 }
 exports.extractWidgetProps = extractWidgetProps;
-function generatedDynamicData(data) {
+function generatedDynamicData(data, compInfo) {
     const staticProps = {};
     const boundProps = {};
-    for (const key in data) {
+    for (const key of Object.keys(data)) {
         if (mp_1.builtinWigetProps.indexOf(key) > -1)
             continue;
         const { type, value } = data[key];
         if (!type || type === 'static') {
             staticProps[key] = value;
+            if (value === undefined) {
+                /* 为了避免绑定undefined的时候，与组件properties类型声明不匹配
+                在小程序基础库2.18后会爆warning
+                所以提前给他准备空值
+                */
+                if ((compInfo === null || compInfo === void 0 ? void 0 : compInfo.dataForm[key]) && mp_1.jsonSchemaType2jsClass[compInfo.dataForm[key].type]) {
+                    const globalNamespace = typeof globalThis === 'undefined' ? global : globalThis;
+                    const constructorName = mp_1.jsonSchemaType2jsClass[compInfo.dataForm[key].type];
+                    const defaultValue = globalNamespace[constructorName]();
+                    staticProps[key] = defaultValue;
+                }
+            }
         }
         else {
             boundProps[key] = generateDataBind(data[key]);
@@ -100,7 +112,12 @@ function createWidgetProps(widgets, ctx) {
             console.error('Component lib not found', xComponent);
             return;
         }
-        widgetProps[id] = extractWidgetProps(xProps);
+        const widegetComp = materialLib === null || materialLib === void 0 ? void 0 : materialLib.components.find((comp) => comp.name === xComponent.name);
+        if (!widegetComp) {
+            console.error('Component not found in lib', widegetComp);
+            return;
+        }
+        widgetProps[id] = extractWidgetProps(xProps, widegetComp);
         widgetProps[id]._parentId = parentId;
         widgetProps[id]._order = widget.xIndex;
         widgetProps[id].widgetType = xComponent.moduleName + ':' + xComponent.name;
@@ -178,7 +195,8 @@ function createEventHanlders(widgets, componentApi, ctx) {
         // 如果是数据容器，则生成一个onDataChange事件处理
         if ((_c = compProto === null || compProto === void 0 ? void 0 : compProto.compConfig) === null || _c === void 0 ? void 0 : _c.isDataContainer) {
             const customName = (0, wxml_1.getMpEventHanlderName)(id, 'onDataChange', {});
-            eventHanlders[customName] = [{
+            eventHanlders[customName] = [
+                {
                     key: '',
                     handler: `({event})=>{
           app.utils.set(context, '${id}.data', event?.detail?.data);
@@ -186,7 +204,8 @@ function createEventHanlders(widgets, componentApi, ctx) {
                     handlerModule: weapps_core_1.ActionType.Platform,
                     data: {},
                     boundData: {},
-                }];
+                },
+            ];
         }
     });
     return eventHanlders;

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.21",
+  "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 { createInitData } from './widget';
 
 /**
  * Lowcodes of all components
@@ -13,7 +13,7 @@ import lodashGet from 'lodash.get';
 export const compLowcodes = {}
 
 export function createComponent(key, behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes, undefined, context) {
-
+  const initData = createInitData(widgetProps, dataBinds, '');
   compLowcodes[key] = {
     index,
     stateFn,
@@ -45,7 +45,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       ...properties,
     },
 
-    data: {},
+    data: initData,
 
     lifetimes: {
       created() {

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
   }, {})

package/template/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-beta.0",
     "@tcwd/weapps-core": "2.2.6",
-    "@tcwd/weapps-sdk": "1.2.9",
+    "@tcwd/weapps-sdk": "1.2.10",
     "@zxing/library": "^0.18.6",
     "@cloudbase/weda-client": "^0.2.4",
     "fastclick": "^1.0.6",