@cloudbase/lowcode-builder 0.1.21 → 0.1.22

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/package.json

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

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",