@cloudbase/lowcode-builder 0.1.20 → 0.1.23

package/lib/builder/config/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -43,13 +39,11 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-// export const builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.zip';
 exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20220616.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-// export const miniprogramURL = 'https://cos-1252394733.cos.ap-nanjing.myqcloud.com/miniprogram_npm.zip';
 exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20220616.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到

package/lib/builder/h5/copy.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/h5/material.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/materials.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/mixMode.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/mp_config.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -109,8 +105,8 @@ function generateMpConfig(weapps, ctx) {
         appConfig.plugins = plugins;
     }
     miniprogramPlugins.forEach((plugin) => {
-        var _a;
-        if (!((_a = appConfig === null || appConfig === void 0 ? void 0 : appConfig.plugins) === null || _a === void 0 ? void 0 : _a[plugin.name])) {
+        var _a, _b;
+        if (!((_b = (_a = appConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b[plugin.name])) {
             (0, lodash_1.set)(appConfig, `plugins.${plugin.name}`, {
                 version: plugin.version,
                 provider: plugin.pluginAppId,

package/lib/builder/mp/plugin.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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/util/generateFiles.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/mp.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/net.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 interface IProcessOptions {
     onStdout?: (data: Buffer) => any;

package/lib/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.20",
+  "version": "0.1.23",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -8,11 +8,13 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
+    "dist": "dist",
     "lib": "lib",
     "test": "__tests__"
   },
   "files": [
     "lib",
+    "dist",
     "template"
   ],
   "publishConfig": {
@@ -84,4 +86,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

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';
 
 /**
  * Lowcodes of all components
@@ -13,7 +13,11 @@ 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 = {};
+  for (const id in widgetProps) {
+    const props = widgetProps[id]
+    initData['' + id] = resolveWidgetData(props)
+  }
   compLowcodes[key] = {
     index,
     stateFn,
@@ -45,7 +49,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       ...properties,
     },
 
-    data: {},
+    data: initData,
 
     lifetimes: {
       created() {

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "^0.2.4",
+		"@cloudbase/weda-client": "^0.2.12",
     "@cloudbase/oauth": "0.1.1-alpha.5",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

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

package/template/src/index.jsx

@@ -1,3 +1,12 @@
+/**
+ * 当本应用是乾坤子应用是，publicPath需要设置为子应用的相对路径
+ * 这个变量时序重要需要先初始化
+ */
+if (window.__POWERED_BY_QIANKUN__) {
+  __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+}
+
+
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { setConfig } from './datasources/index'